Navigation

Changeset 5107

Timestamp:

12/11/07 14:32:06 (1 year ago)

Author:

morris

Message:

Add combo box for selecting preferred subtitle

Files:

r5099	r5107
13	13	<string>id</string>
14	14	<key>playMoviesWhenOpened</key>
	15	<string>id</string>
	16	<key>preferredSubtitle</key>
15	17	<string>id</string>
16	18	<key>resumeBehavior</key>
…	…
31	33	<key>_playMoviesWhenOpenedButton</key>
32	34	<string>NSButton</string>
	35	<key>_preferredSubtitleComboBox</key>
	36	<string>NSComboBox</string>
33	37	<key>_resumeBehaviorMatrix</key>
34	38	<string>NSMatrix</string>

r5099	r5107
150	150
151	151	- (void)_loadTracks {
152		NSString ~~type, format~~;
	152	NSString name, type, format, subtitlePattern;
153	153	QTTrack *track;
154	154	NSUInteger audioIndex, subtitleIndex;
…	…
182	182	else if([type isEqualToString:QTMediaTypeVideo] && [track isEnabled]) {
183	183	_fps = [[[track media] attributeForKey:QTMediaSampleCountAttribute] unsignedIntegerValue] / _duration;
	184	}
	185	}
	186
	187	subtitlePattern = [SPSettings objectForKey:SPPreferredSubtitlePattern];
	188
	189	if([subtitlePattern length] > 0) {
	190	subtitleIndex = 1;
	191
	192	for(track in _subtitleTracks) {
	193	name = [track attributeForKey:QTTrackDisplayNameAttribute];
	194
	195	if([name containsSubstring:subtitlePattern options:NSCaseInsensitiveSearch]) {
	196	[self setSubtitleTrack:subtitleIndex];
	197
	198	break;
	199	}
	200
	201	subtitleIndex++;
184	202	}
185	203	}

r5099	r5107
33	33	IBOutlet NSSlider *_fastForwardSpeedSlider;
34	34	IBOutlet NSTextField *_fastForwardSpeedTextField;
	35	IBOutlet NSComboBox *_preferredSubtitleComboBox;
35	36	}
36	37
…	…
41	42	- (IBAction)resumeBehavior:(id)sender;
42	43	- (IBAction)fastForwardSpeed:(id)sender;
	44	- (IBAction)preferredSubtitle:(id)sender;
43	45
44	46	@end

r5099	r5107
77	77	[_resumeBehaviorMatrix selectCellWithTag:[SPSettings intForKey:SPResumePlayingBehavior]];
78	78	[_fastForwardSpeedSlider setDoubleValue:sqrt([SPSettings doubleForKey:SPFastForwardFactor])];
	79	[_preferredSubtitleComboBox setStringValue:[SPSettings objectForKey:SPPreferredSubtitlePattern]];
79	80
80	81	[self _updateFastForwardSpeedTextField];
…	…
109	110	}
110	111
	112
	113
	114	- (IBAction)preferredSubtitle:(id)sender {
	115	[SPSettings setObject:[_preferredSubtitleComboBox stringValue] forKey:SPPreferredSubtitlePattern];
	116	}
	117
111	118	@end

r5099	r5107
31	31	#define SPFastForwardFactor @"SPFastForwardFactor"
32	32	#define SPResumePlayingBehavior @"SPResumePlayingBehavior"
	33	#define SPPreferredSubtitlePattern @"SPPreferredSubtitlePattern"
33	34
34	35	#define SPPlaylist @"SPPlaylist"

r5099	r5107
43	43	[NSNumber numberWithInt:SPAlwaysAsk],
44	44	SPResumePlayingBehavior,
	45	@"",
	46	SPPreferredSubtitlePattern,
45	47
46	48	[NSNumber numberWithInt:SPPlaylistRepeatOff],