• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscapheguic翻訳omegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

githubのコードからのfolk


コミットメタ情報

リビジョン5f1337b0149ef0a9f208adcff3ec73e79a36ad1a (tree)
日時2011-03-02 03:45:17
作者dynaflash <dynaflash@b64f...>
コミッターdynaflash

ログメッセージ

MacGui: Remove Target Size as a rate control option as it doesn't really work correctly and should die an overdue death.
- Also rearranged the video quality layout a bit.
- Moved Constant Quality above Average Bitrate
- Moved the entire Video Quality matrix down below frame rate where it belongs.
- Presets are mapped accordingly internally in the macgui code so that they are unchanged across platforms.

git-svn-id: svn://localhost/HandBrake/trunk@3823 b64f7644-9d1e-0410-96f1-a4d463321fa5

変更サマリ

差分

--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -127,8 +127,6 @@ BOOL fIsDragging;
127127 IBOutlet NSTextField * fVidQualityRFLabel;
128128 IBOutlet NSTextField * fVidQualityRFField;
129129 IBOutlet NSMatrix * fVidQualityMatrix;
130- IBOutlet NSButtonCell * fVidTargetCell;
131- IBOutlet NSTextField * fVidTargetSizeField;
132130 IBOutlet NSButtonCell * fVidBitrateCell;
133131 IBOutlet NSTextField * fVidBitrateField;
134132 IBOutlet NSButtonCell * fVidConstantCell;
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -525,9 +525,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
525525
526526
527527 /* Video quality */
528- [fVidTargetSizeField setIntValue: 700];
529528 [fVidBitrateField setIntValue: 1000];
530-
531529 [fVidQualityMatrix selectCell: fVidBitrateCell];
532530 [self videoMatrixChanged:nil];
533531
@@ -2326,8 +2324,7 @@ fWorkingCount = 0;
23262324 /* x264 Option String */
23272325 [queueFileJob setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
23282326
2329- [queueFileJob setObject:[NSNumber numberWithInt:[fVidQualityMatrix selectedRow]] forKey:@"VideoQualityType"];
2330- [queueFileJob setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"];
2327+ [queueFileJob setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] + 1] forKey:@"VideoQualityType"];
23312328 [queueFileJob setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"];
23322329 [queueFileJob setObject:[NSNumber numberWithFloat:[fVidQualityRFField floatValue]] forKey:@"VideoQualitySlider"];
23332330 /* Framerate */
@@ -2755,7 +2752,6 @@ fWorkingCount = 0;
27552752 /* Video quality */
27562753 [fVidQualityMatrix selectCellAtRow:[[queueToApply objectForKey:@"VideoQualityType"] intValue] column:0];
27572754
2758- [fVidTargetSizeField setStringValue:[queueToApply objectForKey:@"VideoTargetSize"]];
27592755 [fVidBitrateField setStringValue:[queueToApply objectForKey:@"VideoAvgBitrate"]];
27602756 /* Since we are now using RF Values for the slider, we detect if the preset uses an old quality float.
27612757 * So, check to see if the quality value is less than 1.0 which should indicate the old ".062" type
@@ -3076,17 +3072,15 @@ fWorkingCount = 0;
30763072 }
30773073 }
30783074
3079- switch( [fVidQualityMatrix selectedRow] )
3075+ switch( [[fVidQualityMatrix selectedCell] tag] )
30803076 {
30813077 case 0:
3082- /* Target size.
3083- Bitrate should already have been calculated and displayed
3084- in fVidBitrateField, so let's just use it */
3085- case 1:
3078+ /* ABR */
30863079 job->vquality = -1.0;
30873080 job->vbitrate = [fVidBitrateField intValue];
30883081 break;
3089- case 2:
3082+ case 1:
3083+ /* Constant Quality */
30903084 job->vquality = [fVidQualityRFField floatValue];
30913085 job->vbitrate = 0;
30923086 break;
@@ -3576,9 +3570,6 @@ bool one_burned = FALSE;
35763570
35773571 if ( [[queueToApply objectForKey:@"VideoQualityType"] intValue] != 2 )
35783572 {
3579- /* Target size.
3580- Bitrate should already have been calculated and displayed
3581- in fVidBitrateField, so let's just use it same as abr*/
35823573 job->vquality = -1.0;
35833574 job->vbitrate = [[queueToApply objectForKey:@"VideoAvgBitrate"] intValue];
35843575 }
@@ -4418,7 +4409,7 @@ bool one_burned = FALSE;
44184409 @"%02lld:%02lld:%02lld", duration / 3600, ( duration / 60 ) % 60,
44194410 duration % 60]];
44204411
4421- [self calculateBitrate: sender];
4412+ //[self calculateBitrate: sender];
44224413
44234414 if ( [fSrcChapterStartPopUp indexOfSelectedItem] == [fSrcChapterEndPopUp indexOfSelectedItem] )
44244415 {
@@ -4683,33 +4674,33 @@ the user is using "Custom" settings by determining the sender*/
46834674 /* We call method method to change UI to reflect whether a preset is used or not*/
46844675 [self customSettingUsed: sender];
46854676 }
4677+
46864678 - (IBAction) videoMatrixChanged: (id) sender;
46874679 {
4688- bool target, bitrate, quality;
4689-
4690- target = bitrate = quality = false;
4680+ /* We use the selectedCell: tag of the fVidQualityMatrix instead of selectedRow
4681+ * so that the order of the video controls can be switched around.
4682+ * Constant quality is 1 and Average bitrate is 0 for reference. */
4683+ bool bitrate, quality;
4684+ bitrate = quality = false;
46914685 if( [fVidQualityMatrix isEnabled] )
46924686 {
4693- switch( [fVidQualityMatrix selectedRow] )
4687+ switch( [[fVidQualityMatrix selectedCell] tag] )
46944688 {
46954689 case 0:
4696- target = true;
4697- break;
4698- case 1:
46994690 bitrate = true;
47004691 break;
4701- case 2:
4692+ case 1:
47024693 quality = true;
47034694 break;
47044695 }
47054696 }
4706- [fVidTargetSizeField setEnabled: target];
4697+
47074698 [fVidBitrateField setEnabled: bitrate];
47084699 [fVidQualitySlider setEnabled: quality];
47094700 [fVidQualityRFField setEnabled: quality];
47104701 [fVidQualityRFLabel setEnabled: quality];
47114702 [fVidTwoPassCheck setEnabled: !quality &&
4712- [fVidQualityMatrix isEnabled]];
4703+ [fVidQualityMatrix isEnabled]];
47134704 if( quality )
47144705 {
47154706 [fVidTwoPassCheck setState: NSOffState];
@@ -4718,7 +4709,7 @@ the user is using "Custom" settings by determining the sender*/
47184709 }
47194710
47204711 [self qualitySliderChanged: sender];
4721- [self calculateBitrate: sender];
4712+ //[self calculateBitrate: sender];
47224713 [self customSettingUsed: sender];
47234714 }
47244715
@@ -4811,7 +4802,7 @@ the user is using "Custom" settings by determining the sender*/
48114802
48124803 - (IBAction) calculateBitrate: (id) sender
48134804 {
4814- if( !fHandle || [fVidQualityMatrix selectedRow] != 0 || !SuccessfulScan )
4805+ if( !fHandle || ![fVidQualityMatrix selectedRow] || !SuccessfulScan )
48154806 {
48164807 return;
48174808 }
@@ -4836,7 +4827,6 @@ the user is using "Custom" settings by determining the sender*/
48364827 /* Audio goes here */
48374828 [fAudioDelegate prepareAudioForJob: job];
48384829
4839-[fVidBitrateField setIntValue: hb_calc_bitrate( job, [fVidTargetSizeField intValue] )];
48404830 }
48414831
48424832 #pragma mark -
@@ -5517,9 +5507,19 @@ return YES;
55175507 [self calculateBitrate:nil];
55185508
55195509 /* Video quality */
5520- [fVidQualityMatrix selectCellAtRow:[[chosenPreset objectForKey:@"VideoQualityType"] intValue] column:0];
55215510
5522- [fVidTargetSizeField setStringValue:[chosenPreset objectForKey:@"VideoTargetSize"]];
5511+ int qualityType = [[chosenPreset objectForKey:@"VideoQualityType"] intValue] - 1;
5512+ /* Note since the removal of Target Size encoding, the possible values for VideoQuality type are 0 - 1.
5513+ * Therefore any preset that uses the old 2 for Constant Quality would now use 1 since there is one less index
5514+ * for the fVidQualityMatrix. It should also be noted that any preset that used the deprecated Target Size
5515+ * setting of 0 would set us to 0 or ABR since ABR is now tagged 0. Fortunately this does not affect any built-in
5516+ * presets since they all use Constant Quality or Average Bitrate.*/
5517+ if (qualityType == -1)
5518+ {
5519+ qualityType = 0;
5520+ }
5521+ [fVidQualityMatrix selectCellWithTag:qualityType];
5522+
55235523 [fVidBitrateField setStringValue:[chosenPreset objectForKey:@"VideoAvgBitrate"]];
55245524
55255525 /* Since we are now using RF Values for the slider, we detect if the preset uses an old quality float.
@@ -6013,8 +6013,10 @@ return YES;
60136013 /* x264 Option String */
60146014 [preset setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"];
60156015
6016- [preset setObject:[NSNumber numberWithInt:[fVidQualityMatrix selectedRow]] forKey:@"VideoQualityType"];
6017- [preset setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"];
6016+ /* though there are actually only 0 - 1 types available in the ui we need to map to the old 0 - 2
6017+ * set of indexes from when we had 0 == Target , 1 == Abr and 2 == Constant Quality for presets
6018+ * to take care of any legacy presets. */
6019+ [preset setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] +1 ] forKey:@"VideoQualityType"];
60186020 [preset setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"];
60196021 [preset setObject:[NSNumber numberWithFloat:[fVidQualityRFField floatValue]] forKey:@"VideoQualitySlider"];
60206022
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -2,10 +2,10 @@
22 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
33 <data>
44 <int key="IBDocument.SystemTarget">1050</int>
5- <string key="IBDocument.SystemVersion">10H574</string>
5+ <string key="IBDocument.SystemVersion">10J567</string>
66 <string key="IBDocument.InterfaceBuilderVersion">732</string>
77 <string key="IBDocument.AppKitVersion">1038.35</string>
8- <string key="IBDocument.HIToolboxVersion">461.00</string>
8+ <string key="IBDocument.HIToolboxVersion">462.00</string>
99 <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
1111 <string key="NS.object.0">732</string>
@@ -105,7 +105,7 @@
105105 <object class="NSTabView" id="712502892">
106106 <reference key="NSNextResponder" ref="168918359"/>
107107 <int key="NSvFlags">264</int>
108- <string key="NSFrame">{{13, 28}, {734, 343}}</string>
108+ <string key="NSFrame">{{13, 26}, {734, 343}}</string>
109109 <reference key="NSSuperview" ref="168918359"/>
110110 <object class="NSMutableArray" key="NSTabViewItems">
111111 <bool key="EncodedWithXMLCoder">YES</bool>
@@ -119,122 +119,40 @@
119119 <object class="NSTextField" id="521019277">
120120 <reference key="NSNextResponder" ref="1053078401"/>
121121 <int key="NSvFlags">256</int>
122- <string key="NSFrame">{{289, 259}, {46, 14}}</string>
122+ <string key="NSFrame">{{14, 205}, {94, 19}}</string>
123123 <reference key="NSSuperview" ref="1053078401"/>
124124 <bool key="NSEnabled">YES</bool>
125125 <object class="NSTextFieldCell" key="NSCell" id="200565868">
126126 <int key="NSCellFlags">67239424</int>
127127 <int key="NSCellFlags2">4194304</int>
128- <string key="NSContents">Quality:</string>
128+ <string key="NSContents">Video Quality:</string>
129129 <reference key="NSSupport" ref="26"/>
130130 <reference key="NSControlView" ref="521019277"/>
131131 <reference key="NSBackgroundColor" ref="242973447"/>
132132 <reference key="NSTextColor" ref="701609070"/>
133133 </object>
134134 </object>
135- <object class="NSMatrix" id="229000833">
136- <reference key="NSNextResponder" ref="1053078401"/>
137- <int key="NSvFlags">256</int>
138- <string key="NSFrame">{{343, 211}, {167, 63}}</string>
139- <reference key="NSSuperview" ref="1053078401"/>
140- <bool key="NSEnabled">YES</bool>
141- <int key="NSNumRows">3</int>
142- <int key="NSNumCols">1</int>
143- <object class="NSMutableArray" key="NSCells">
144- <bool key="EncodedWithXMLCoder">YES</bool>
145- <object class="NSButtonCell" id="867231800">
146- <int key="NSCellFlags">-2080244224</int>
147- <int key="NSCellFlags2">131072</int>
148- <string key="NSContents">Target size (MB):</string>
149- <reference key="NSSupport" ref="26"/>
150- <reference key="NSControlView" ref="229000833"/>
151- <int key="NSButtonFlags">1211912703</int>
152- <int key="NSButtonFlags2">0</int>
153- <object class="NSButtonImageSource" key="NSAlternateImage" id="860784734">
154- <string key="NSImageName">NSRadioButton</string>
155- </object>
156- <string key="NSAlternateContents"/>
157- <object class="NSMutableString" key="NSKeyEquivalent" id="727008564">
158- <characters key="NS.bytes"/>
159- </object>
160- <int key="NSPeriodicDelay">200</int>
161- <int key="NSPeriodicInterval">25</int>
162- </object>
163- <object class="NSButtonCell" id="733978413">
164- <int key="NSCellFlags">67239424</int>
165- <int key="NSCellFlags2">131072</int>
166- <string key="NSContents">Average bitrate (kbps):</string>
167- <reference key="NSSupport" ref="26"/>
168- <reference key="NSControlView" ref="229000833"/>
169- <int key="NSTag">1</int>
170- <int key="NSButtonFlags">1211912703</int>
171- <int key="NSButtonFlags2">0</int>
172- <reference key="NSAlternateImage" ref="860784734"/>
173- <string key="NSAlternateContents"/>
174- <reference key="NSKeyEquivalent" ref="727008564"/>
175- <int key="NSPeriodicDelay">200</int>
176- <int key="NSPeriodicInterval">25</int>
177- </object>
178- <object class="NSButtonCell" id="297078314">
179- <int key="NSCellFlags">67239424</int>
180- <int key="NSCellFlags2">131072</int>
181- <string key="NSContents">Constant quality:</string>
182- <reference key="NSSupport" ref="26"/>
183- <reference key="NSControlView" ref="229000833"/>
184- <int key="NSButtonFlags">1211912703</int>
185- <int key="NSButtonFlags2">0</int>
186- <reference key="NSAlternateImage" ref="860784734"/>
187- <string key="NSAlternateContents"/>
188- <string key="NSKeyEquivalent"/>
189- <int key="NSPeriodicDelay">400</int>
190- <int key="NSPeriodicInterval">75</int>
191- </object>
192- </object>
193- <string key="NSCellSize">{167, 15}</string>
194- <string key="NSIntercellSpacing">{4, 9}</string>
195- <int key="NSMatrixFlags">1143472128</int>
196- <string key="NSCellClass">NSActionCell</string>
197- <object class="NSButtonCell" key="NSProtoCell" id="779990493">
198- <int key="NSCellFlags">67239424</int>
199- <int key="NSCellFlags2">0</int>
200- <string key="NSContents">Radio</string>
201- <object class="NSFont" key="NSSupport" id="273283760">
202- <string key="NSName">LucidaGrande</string>
203- <double key="NSSize">13</double>
204- <int key="NSfFlags">1044</int>
205- </object>
206- <int key="NSButtonFlags">1211912703</int>
207- <int key="NSButtonFlags2">0</int>
208- <reference key="NSAlternateImage" ref="860784734"/>
209- <int key="NSPeriodicDelay">400</int>
210- <int key="NSPeriodicInterval">75</int>
211- </object>
212- <reference key="NSSelectedCell" ref="867231800"/>
213- <reference key="NSBackgroundColor" ref="242973447"/>
214- <object class="NSColor" key="NSCellBackgroundColor" id="809784795">
215- <int key="NSColorSpace">3</int>
216- <bytes key="NSWhite">MQA</bytes>
217- </object>
218- <reference key="NSFont" ref="273283760"/>
219- </object>
220- <object class="NSTextField" id="127917338">
135+ <object class="NSTextField" id="783405221">
221136 <reference key="NSNextResponder" ref="1053078401"/>
222137 <int key="NSvFlags">256</int>
223- <string key="NSFrame">{{512, 257}, {84, 19}}</string>
138+ <string key="NSFrame">{{170, 166}, {84, 19}}</string>
224139 <reference key="NSSuperview" ref="1053078401"/>
225140 <bool key="NSEnabled">YES</bool>
226- <object class="NSTextFieldCell" key="NSCell" id="850340172">
141+ <object class="NSTextFieldCell" key="NSCell" id="351953267">
227142 <int key="NSCellFlags">-1804468671</int>
228143 <int key="NSCellFlags2">4326400</int>
229144 <string key="NSContents"/>
230145 <reference key="NSSupport" ref="26"/>
231- <reference key="NSControlView" ref="127917338"/>
146+ <reference key="NSControlView" ref="783405221"/>
232147 <bool key="NSDrawsBackground">YES</bool>
233148 <object class="NSColor" key="NSBackgroundColor" id="138233214">
234149 <int key="NSColorSpace">6</int>
235150 <string key="NSCatalogName">System</string>
236151 <string key="NSColorName">textBackgroundColor</string>
237- <reference key="NSColor" ref="809784795"/>
152+ <object class="NSColor" key="NSColor" id="809784795">
153+ <int key="NSColorSpace">3</int>
154+ <bytes key="NSWhite">MQA</bytes>
155+ </object>
238156 </object>
239157 <object class="NSColor" key="NSTextColor" id="378140636">
240158 <int key="NSColorSpace">6</int>
@@ -244,27 +162,10 @@
244162 </object>
245163 </object>
246164 </object>
247- <object class="NSTextField" id="783405221">
248- <reference key="NSNextResponder" ref="1053078401"/>
249- <int key="NSvFlags">256</int>
250- <string key="NSFrame">{{512, 233}, {84, 19}}</string>
251- <reference key="NSSuperview" ref="1053078401"/>
252- <bool key="NSEnabled">YES</bool>
253- <object class="NSTextFieldCell" key="NSCell" id="351953267">
254- <int key="NSCellFlags">-1804468671</int>
255- <int key="NSCellFlags2">4326400</int>
256- <string key="NSContents"/>
257- <reference key="NSSupport" ref="26"/>
258- <reference key="NSControlView" ref="783405221"/>
259- <bool key="NSDrawsBackground">YES</bool>
260- <reference key="NSBackgroundColor" ref="138233214"/>
261- <reference key="NSTextColor" ref="378140636"/>
262- </object>
263- </object>
264165 <object class="NSSlider" id="239657287">
265166 <reference key="NSNextResponder" ref="1053078401"/>
266167 <int key="NSvFlags">256</int>
267- <string key="NSFrame">{{292, 186}, {405, 16}}</string>
168+ <string key="NSFrame">{{272, 186}, {425, 16}}</string>
268169 <reference key="NSSuperview" ref="1053078401"/>
269170 <bool key="NSEnabled">YES</bool>
270171 <object class="NSSliderCell" key="NSCell" id="160453387">
@@ -308,7 +209,7 @@
308209 <object class="NSTextField" id="690304958">
309210 <reference key="NSNextResponder" ref="1053078401"/>
310211 <int key="NSvFlags">256</int>
311- <string key="NSFrame">{{531, 211}, {169, 14}}</string>
212+ <string key="NSFrame">{{192, 188}, {65, 14}}</string>
312213 <reference key="NSSuperview" ref="1053078401"/>
313214 <bool key="NSEnabled">YES</bool>
314215 <object class="NSTextFieldCell" key="NSCell" id="923732752">
@@ -391,7 +292,7 @@
391292 <object class="NSTextField" id="323705695">
392293 <reference key="NSNextResponder" ref="1053078401"/>
393294 <int key="NSvFlags">256</int>
394- <string key="NSFrame">{{509, 211}, {28, 14}}</string>
295+ <string key="NSFrame">{{167, 188}, {28, 14}}</string>
395296 <reference key="NSSuperview" ref="1053078401"/>
396297 <bool key="NSEnabled">YES</bool>
397298 <object class="NSTextFieldCell" key="NSCell" id="936221726">
@@ -439,7 +340,7 @@
439340 <object class="NSPopUpButton" id="222980245">
440341 <reference key="NSNextResponder" ref="1053078401"/>
441342 <int key="NSvFlags">256</int>
442- <string key="NSFrame">{{106, 229}, {149, 22}}</string>
343+ <string key="NSFrame">{{372, 254}, {158, 22}}</string>
443344 <reference key="NSSuperview" ref="1053078401"/>
444345 <bool key="NSEnabled">YES</bool>
445346 <object class="NSPopUpButtonCell" key="NSCell" id="343952154">
@@ -493,7 +394,7 @@
493394 <object class="NSButton" id="1000247853">
494395 <reference key="NSNextResponder" ref="1053078401"/>
495396 <int key="NSvFlags">256</int>
496- <string key="NSFrame">{{106, 183}, {124, 18}}</string>
397+ <string key="NSFrame">{{270, 166}, {124, 18}}</string>
497398 <reference key="NSSuperview" ref="1053078401"/>
498399 <bool key="NSEnabled">YES</bool>
499400 <object class="NSButtonCell" key="NSCell" id="860863090">
@@ -516,7 +417,7 @@
516417 <object class="NSButton" id="852146403">
517418 <reference key="NSNextResponder" ref="1053078401"/>
518419 <int key="NSvFlags">-2147483392</int>
519- <string key="NSFrame">{{106, 206}, {148, 18}}</string>
420+ <string key="NSFrame">{{536, 257}, {143, 18}}</string>
520421 <reference key="NSSuperview" ref="1053078401"/>
521422 <bool key="NSEnabled">YES</bool>
522423 <object class="NSButtonCell" key="NSCell" id="409419177">
@@ -537,7 +438,7 @@
537438 <object class="NSButton" id="447003158">
538439 <reference key="NSNextResponder" ref="1053078401"/>
539440 <int key="NSvFlags">256</int>
540- <string key="NSFrame">{{123, 165}, {107, 16}}</string>
441+ <string key="NSFrame">{{407, 167}, {107, 16}}</string>
541442 <reference key="NSSuperview" ref="1053078401"/>
542443 <bool key="NSEnabled">YES</bool>
543444 <object class="NSButtonCell" key="NSCell" id="1070893195">
@@ -562,7 +463,7 @@
562463 <object class="NSPopUpButton" id="12330413">
563464 <reference key="NSNextResponder" ref="1053078401"/>
564465 <int key="NSvFlags">256</int>
565- <string key="NSFrame">{{106, 254}, {149, 22}}</string>
466+ <string key="NSFrame">{{98, 254}, {149, 22}}</string>
566467 <reference key="NSSuperview" ref="1053078401"/>
567468 <bool key="NSEnabled">YES</bool>
568469 <object class="NSPopUpButtonCell" key="NSCell" id="1018849574">
@@ -610,7 +511,7 @@
610511 <object class="NSTextField" id="463960465">
611512 <reference key="NSNextResponder" ref="1053078401"/>
612513 <int key="NSvFlags">256</int>
613- <string key="NSFrame">{{9, 231}, {92, 17}}</string>
514+ <string key="NSFrame">{{278, 256}, {92, 17}}</string>
614515 <reference key="NSSuperview" ref="1053078401"/>
615516 <bool key="NSEnabled">YES</bool>
616517 <object class="NSTextFieldCell" key="NSCell" id="509250281">
@@ -626,12 +527,12 @@
626527 <object class="NSTextField" id="1064150725">
627528 <reference key="NSNextResponder" ref="1053078401"/>
628529 <int key="NSvFlags">256</int>
629- <string key="NSFrame">{{14, 256}, {87, 17}}</string>
530+ <string key="NSFrame">{{14, 256}, {79, 17}}</string>
630531 <reference key="NSSuperview" ref="1053078401"/>
631532 <bool key="NSEnabled">YES</bool>
632533 <object class="NSTextFieldCell" key="NSCell" id="451922400">
633534 <int key="NSCellFlags">67239424</int>
634- <int key="NSCellFlags2">71303168</int>
535+ <int key="NSCellFlags2">4194304</int>
635536 <string key="NSContents">Video Codec:</string>
636537 <reference key="NSSupport" ref="26"/>
637538 <reference key="NSControlView" ref="1064150725"/>
@@ -639,6 +540,207 @@
639540 <reference key="NSTextColor" ref="701609070"/>
640541 </object>
641542 </object>
543+ <object class="NSMatrix" id="1036976683">
544+ <reference key="NSNextResponder" ref="1053078401"/>
545+ <int key="NSvFlags">268</int>
546+ <string key="NSFrame">{{17, 166}, {145, 38}}</string>
547+ <reference key="NSSuperview" ref="1053078401"/>
548+ <bool key="NSEnabled">YES</bool>
549+ <int key="NSNumRows">2</int>
550+ <int key="NSNumCols">1</int>
551+ <object class="NSMutableArray" key="NSCells">
552+ <bool key="EncodedWithXMLCoder">YES</bool>
553+ <object class="NSButtonCell" id="613962178">
554+ <int key="NSCellFlags">-2080244224</int>
555+ <int key="NSCellFlags2">131072</int>
556+ <string key="NSContents">Constant Quality</string>
557+ <reference key="NSSupport" ref="26"/>
558+ <reference key="NSControlView" ref="1036976683"/>
559+ <int key="NSTag">1</int>
560+ <int key="NSButtonFlags">1211912703</int>
561+ <int key="NSButtonFlags2">0</int>
562+ <object class="NSButtonImageSource" key="NSAlternateImage" id="860784734">
563+ <string key="NSImageName">NSRadioButton</string>
564+ </object>
565+ <string key="NSAlternateContents"/>
566+ <string key="NSKeyEquivalent"/>
567+ <int key="NSPeriodicDelay">200</int>
568+ <int key="NSPeriodicInterval">25</int>
569+ </object>
570+ <object class="NSButtonCell" id="878990764">
571+ <int key="NSCellFlags">67239424</int>
572+ <int key="NSCellFlags2">131072</int>
573+ <string key="NSContents">Average Bitrate (kbps):</string>
574+ <reference key="NSSupport" ref="26"/>
575+ <reference key="NSControlView" ref="1036976683"/>
576+ <int key="NSButtonFlags">1211912703</int>
577+ <int key="NSButtonFlags2">0</int>
578+ <object class="NSImage" key="NSNormalImage">
579+ <int key="NSImageFlags">549453824</int>
580+ <string key="NSSize">{18, 18}</string>
581+ <object class="NSMutableArray" key="NSReps">
582+ <bool key="EncodedWithXMLCoder">YES</bool>
583+ <object class="NSArray">
584+ <bool key="EncodedWithXMLCoder">YES</bool>
585+ <integer value="0"/>
586+ <object class="NSBitmapImageRep">
587+ <object class="NSData" key="NSTIFFRepresentation">
588+ <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
589+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
590+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
591+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
592+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
593+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
594+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
595+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
596+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
597+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
598+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
599+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
600+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
601+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
602+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
603+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
604+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
605+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
606+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
607+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
608+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
609+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
610+AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
611+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
612+AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw
613+cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
614+AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
615+AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA
616+AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA
617+BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA
618+AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA
619+AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
620+cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
621+AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH
622+SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF
623+hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8
624+vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt
625+7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq
626+Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo
627+aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e
628+n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX
629+2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW
630+FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O
631+Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6
632+ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt
633+rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA
634+AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA
635+AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl
636+A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq
637+DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU
638+HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8
639+MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v
640+UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/
641+eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj
642+rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn
643+5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh
644+AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK
645+CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY
646+GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95
647+MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S
648+UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2
649+d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV
650+pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK
651+0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf//
652+AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw
653+BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA
654+FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H
655+LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh
656+Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ
657+h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp
658+svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb
659+1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX
660+8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA
661+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
662+AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE
663+AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg
664+QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
665+ </object>
666+ </object>
667+ </object>
668+ </object>
669+ <object class="NSColor" key="NSColor" id="936477564">
670+ <int key="NSColorSpace">3</int>
671+ <bytes key="NSWhite">MCAwAA</bytes>
672+ </object>
673+ </object>
674+ <reference key="NSAlternateImage" ref="860784734"/>
675+ <int key="NSPeriodicDelay">400</int>
676+ <int key="NSPeriodicInterval">75</int>
677+ </object>
678+ </object>
679+ <string key="NSCellSize">{145, 18}</string>
680+ <string key="NSIntercellSpacing">{4, 2}</string>
681+ <int key="NSMatrixFlags">1151868928</int>
682+ <string key="NSCellClass">NSActionCell</string>
683+ <object class="NSButtonCell" key="NSProtoCell" id="121093497">
684+ <int key="NSCellFlags">67239424</int>
685+ <int key="NSCellFlags2">0</int>
686+ <string key="NSContents">Radio</string>
687+ <object class="NSFont" key="NSSupport" id="273283760">
688+ <string key="NSName">LucidaGrande</string>
689+ <double key="NSSize">13</double>
690+ <int key="NSfFlags">1044</int>
691+ </object>
692+ <int key="NSButtonFlags">1211912703</int>
693+ <int key="NSButtonFlags2">0</int>
694+ <object class="NSImage" key="NSNormalImage">
695+ <int key="NSImageFlags">549453824</int>
696+ <string key="NSSize">{18, 18}</string>
697+ <object class="NSMutableArray" key="NSReps">
698+ <bool key="EncodedWithXMLCoder">YES</bool>
699+ <object class="NSArray">
700+ <bool key="EncodedWithXMLCoder">YES</bool>
701+ <integer value="0"/>
702+ <object class="NSBitmapImageRep">
703+ <object class="NSData" key="NSTIFFRepresentation">
704+ <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
705+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
706+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
707+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
708+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
709+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
710+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
711+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
712+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
713+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
714+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
715+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
716+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
717+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
718+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
719+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
720+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
721+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
722+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
723+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
724+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
725+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
726+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
727+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
728+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
729+ </object>
730+ </object>
731+ </object>
732+ </object>
733+ <reference key="NSColor" ref="936477564"/>
734+ </object>
735+ <reference key="NSAlternateImage" ref="860784734"/>
736+ <int key="NSPeriodicDelay">400</int>
737+ <int key="NSPeriodicInterval">75</int>
738+ </object>
739+ <reference key="NSSelectedCell" ref="613962178"/>
740+ <reference key="NSBackgroundColor" ref="242973447"/>
741+ <reference key="NSCellBackgroundColor" ref="809784795"/>
742+ <reference key="NSFont" ref="273283760"/>
743+ </object>
642744 </object>
643745 <string key="NSFrame">{{10, 25}, {714, 305}}</string>
644746 <reference key="NSSuperview" ref="712502892"/>
@@ -4545,14 +4647,6 @@
45454647 </object>
45464648 <object class="IBConnectionRecord">
45474649 <object class="IBOutletConnection" key="connection">
4548- <string key="label">fVidBitrateCell</string>
4549- <reference key="source" ref="2258723"/>
4550- <reference key="destination" ref="733978413"/>
4551- </object>
4552- <int key="connectionID">1598</int>
4553- </object>
4554- <object class="IBConnectionRecord">
4555- <object class="IBOutletConnection" key="connection">
45564650 <string key="label">fVidBitrateField</string>
45574651 <reference key="source" ref="2258723"/>
45584652 <reference key="destination" ref="783405221"/>
@@ -4561,14 +4655,6 @@
45614655 </object>
45624656 <object class="IBConnectionRecord">
45634657 <object class="IBOutletConnection" key="connection">
4564- <string key="label">fVidConstantCell</string>
4565- <reference key="source" ref="2258723"/>
4566- <reference key="destination" ref="297078314"/>
4567- </object>
4568- <int key="connectionID">1600</int>
4569- </object>
4570- <object class="IBConnectionRecord">
4571- <object class="IBOutletConnection" key="connection">
45724658 <string key="label">fVidEncoderPopUp</string>
45734659 <reference key="source" ref="2258723"/>
45744660 <reference key="destination" ref="12330413"/>
@@ -4609,22 +4695,6 @@
46094695 </object>
46104696 <object class="IBConnectionRecord">
46114697 <object class="IBOutletConnection" key="connection">
4612- <string key="label">fVidTargetCell</string>
4613- <reference key="source" ref="2258723"/>
4614- <reference key="destination" ref="867231800"/>
4615- </object>
4616- <int key="connectionID">1609</int>
4617- </object>
4618- <object class="IBConnectionRecord">
4619- <object class="IBOutletConnection" key="connection">
4620- <string key="label">fVidTargetSizeField</string>
4621- <reference key="source" ref="2258723"/>
4622- <reference key="destination" ref="127917338"/>
4623- </object>
4624- <int key="connectionID">1610</int>
4625- </object>
4626- <object class="IBConnectionRecord">
4627- <object class="IBOutletConnection" key="connection">
46284698 <string key="label">fVidTwoPassCheck</string>
46294699 <reference key="source" ref="2258723"/>
46304700 <reference key="destination" ref="1000247853"/>
@@ -4633,14 +4703,6 @@
46334703 </object>
46344704 <object class="IBConnectionRecord">
46354705 <object class="IBActionConnection" key="connection">
4636- <string key="label">videoMatrixChanged:</string>
4637- <reference key="source" ref="2258723"/>
4638- <reference key="destination" ref="229000833"/>
4639- </object>
4640- <int key="connectionID">1612</int>
4641- </object>
4642- <object class="IBConnectionRecord">
4643- <object class="IBActionConnection" key="connection">
46444706 <string key="label">formatPopUpChanged:</string>
46454707 <reference key="source" ref="2258723"/>
46464708 <reference key="destination" ref="732193996"/>
@@ -5089,14 +5151,6 @@
50895151 </object>
50905152 <object class="IBConnectionRecord">
50915153 <object class="IBActionConnection" key="connection">
5092- <string key="label">calculateBitrate:</string>
5093- <reference key="source" ref="2258723"/>
5094- <reference key="destination" ref="127917338"/>
5095- </object>
5096- <int key="connectionID">2689</int>
5097- </object>
5098- <object class="IBConnectionRecord">
5099- <object class="IBActionConnection" key="connection">
51005154 <string key="label">customSettingUsed:</string>
51015155 <reference key="source" ref="2258723"/>
51025156 <reference key="destination" ref="783405221"/>
@@ -5105,14 +5159,6 @@
51055159 </object>
51065160 <object class="IBConnectionRecord">
51075161 <object class="IBOutletConnection" key="connection">
5108- <string key="label">delegate</string>
5109- <reference key="source" ref="127917338"/>
5110- <reference key="destination" ref="2258723"/>
5111- </object>
5112- <int key="connectionID">2692</int>
5113- </object>
5114- <object class="IBConnectionRecord">
5115- <object class="IBOutletConnection" key="connection">
51165162 <string key="label">fOpenSourceTitleMMenu</string>
51175163 <reference key="source" ref="2258723"/>
51185164 <reference key="destination" ref="865776798"/>
@@ -5504,14 +5550,6 @@
55045550 <int key="connectionID">5508</int>
55055551 </object>
55065552 <object class="IBConnectionRecord">
5507- <object class="IBOutletConnection" key="connection">
5508- <string key="label">fVidQualityMatrix</string>
5509- <reference key="source" ref="2258723"/>
5510- <reference key="destination" ref="229000833"/>
5511- </object>
5512- <int key="connectionID">5512</int>
5513- </object>
5514- <object class="IBConnectionRecord">
55155553 <object class="IBActionConnection" key="connection">
55165554 <string key="label">encodeStartStopPopUpChanged:</string>
55175555 <reference key="source" ref="2258723"/>
@@ -6134,6 +6172,46 @@
61346172 </object>
61356173 <int key="connectionID">5793</int>
61366174 </object>
6175+ <object class="IBConnectionRecord">
6176+ <object class="IBOutletConnection" key="connection">
6177+ <string key="label">fVidQualityMatrix</string>
6178+ <reference key="source" ref="2258723"/>
6179+ <reference key="destination" ref="1036976683"/>
6180+ </object>
6181+ <int key="connectionID">5812</int>
6182+ </object>
6183+ <object class="IBConnectionRecord">
6184+ <object class="IBOutletConnection" key="connection">
6185+ <string key="label">fVidBitrateCell</string>
6186+ <reference key="source" ref="2258723"/>
6187+ <reference key="destination" ref="878990764"/>
6188+ </object>
6189+ <int key="connectionID">5813</int>
6190+ </object>
6191+ <object class="IBConnectionRecord">
6192+ <object class="IBOutletConnection" key="connection">
6193+ <string key="label">fVidConstantCell</string>
6194+ <reference key="source" ref="2258723"/>
6195+ <reference key="destination" ref="613962178"/>
6196+ </object>
6197+ <int key="connectionID">5814</int>
6198+ </object>
6199+ <object class="IBConnectionRecord">
6200+ <object class="IBActionConnection" key="connection">
6201+ <string key="label">videoMatrixChanged:</string>
6202+ <reference key="source" ref="2258723"/>
6203+ <reference key="destination" ref="613962178"/>
6204+ </object>
6205+ <int key="connectionID">5815</int>
6206+ </object>
6207+ <object class="IBConnectionRecord">
6208+ <object class="IBActionConnection" key="connection">
6209+ <string key="label">videoMatrixChanged:</string>
6210+ <reference key="source" ref="2258723"/>
6211+ <reference key="destination" ref="878990764"/>
6212+ </object>
6213+ <int key="connectionID">5816</int>
6214+ </object>
61376215 </object>
61386216 <object class="IBMutableOrderedSet" key="objectRecords">
61396217 <object class="NSArray" key="orderedObjects">
@@ -6179,7 +6257,6 @@
61796257 <bool key="EncodedWithXMLCoder">YES</bool>
61806258 <reference ref="794651271"/>
61816259 <reference ref="222334056"/>
6182- <reference ref="712502892"/>
61836260 <reference ref="586321835"/>
61846261 <reference ref="854767306"/>
61856262 <reference ref="87961628"/>
@@ -6212,6 +6289,7 @@
62126289 <reference ref="10346684"/>
62136290 <reference ref="210289606"/>
62146291 <reference ref="1007421233"/>
6292+ <reference ref="712502892"/>
62156293 </object>
62166294 <reference key="parent" ref="192660081"/>
62176295 </object>
@@ -6274,23 +6352,22 @@
62746352 <reference key="object" ref="1053078401"/>
62756353 <object class="NSMutableArray" key="children">
62766354 <bool key="EncodedWithXMLCoder">YES</bool>
6277- <reference ref="222980245"/>
6278- <reference ref="1000247853"/>
6279- <reference ref="447003158"/>
6280- <reference ref="12330413"/>
6281- <reference ref="463960465"/>
6282- <reference ref="1064150725"/>
62836355 <reference ref="987137669"/>
62846356 <reference ref="690364175"/>
62856357 <reference ref="503933842"/>
6286- <reference ref="521019277"/>
6287- <reference ref="229000833"/>
6288- <reference ref="127917338"/>
6358+ <reference ref="222980245"/>
6359+ <reference ref="852146403"/>
62896360 <reference ref="783405221"/>
6290- <reference ref="239657287"/>
62916361 <reference ref="690304958"/>
62926362 <reference ref="323705695"/>
6293- <reference ref="852146403"/>
6363+ <reference ref="1000247853"/>
6364+ <reference ref="447003158"/>
6365+ <reference ref="239657287"/>
6366+ <reference ref="12330413"/>
6367+ <reference ref="463960465"/>
6368+ <reference ref="1036976683"/>
6369+ <reference ref="521019277"/>
6370+ <reference ref="1064150725"/>
62946371 </object>
62956372 <reference key="parent" ref="107038816"/>
62966373 </object>
@@ -6304,42 +6381,6 @@
63046381 <reference key="parent" ref="1053078401"/>
63056382 </object>
63066383 <object class="IBObjectRecord">
6307- <int key="objectID">1500</int>
6308- <reference key="object" ref="229000833"/>
6309- <object class="NSMutableArray" key="children">
6310- <bool key="EncodedWithXMLCoder">YES</bool>
6311- <reference ref="867231800"/>
6312- <reference ref="297078314"/>
6313- <reference ref="733978413"/>
6314- <reference ref="779990493"/>
6315- </object>
6316- <reference key="parent" ref="1053078401"/>
6317- </object>
6318- <object class="IBObjectRecord">
6319- <int key="objectID">1501</int>
6320- <reference key="object" ref="867231800"/>
6321- <reference key="parent" ref="229000833"/>
6322- </object>
6323- <object class="IBObjectRecord">
6324- <int key="objectID">1502</int>
6325- <reference key="object" ref="297078314"/>
6326- <reference key="parent" ref="229000833"/>
6327- </object>
6328- <object class="IBObjectRecord">
6329- <int key="objectID">1503</int>
6330- <reference key="object" ref="733978413"/>
6331- <reference key="parent" ref="229000833"/>
6332- </object>
6333- <object class="IBObjectRecord">
6334- <int key="objectID">1504</int>
6335- <reference key="object" ref="127917338"/>
6336- <object class="NSMutableArray" key="children">
6337- <bool key="EncodedWithXMLCoder">YES</bool>
6338- <reference ref="850340172"/>
6339- </object>
6340- <reference key="parent" ref="1053078401"/>
6341- </object>
6342- <object class="IBObjectRecord">
63436384 <int key="objectID">1505</int>
63446385 <reference key="object" ref="783405221"/>
63456386 <object class="NSMutableArray" key="children">
@@ -7613,11 +7654,6 @@
76137654 <reference key="parent" ref="521019277"/>
76147655 </object>
76157656 <object class="IBObjectRecord">
7616- <int key="objectID">4873</int>
7617- <reference key="object" ref="850340172"/>
7618- <reference key="parent" ref="127917338"/>
7619- </object>
7620- <object class="IBObjectRecord">
76217657 <int key="objectID">4874</int>
76227658 <reference key="object" ref="351953267"/>
76237659 <reference key="parent" ref="783405221"/>
@@ -7916,11 +7952,6 @@
79167952 <reference key="parent" ref="655257851"/>
79177953 </object>
79187954 <object class="IBObjectRecord">
7919- <int key="objectID">4954</int>
7920- <reference key="object" ref="779990493"/>
7921- <reference key="parent" ref="229000833"/>
7922- </object>
7923- <object class="IBObjectRecord">
79247955 <int key="objectID">4955</int>
79257956 <reference key="object" ref="686068440"/>
79267957 <reference key="parent" ref="77208310"/>
@@ -8967,6 +8998,32 @@
89678998 <reference key="object" ref="852982078"/>
89688999 <reference key="parent" ref="393032802"/>
89699000 </object>
9001+ <object class="IBObjectRecord">
9002+ <int key="objectID">5808</int>
9003+ <reference key="object" ref="1036976683"/>
9004+ <object class="NSMutableArray" key="children">
9005+ <bool key="EncodedWithXMLCoder">YES</bool>
9006+ <reference ref="613962178"/>
9007+ <reference ref="878990764"/>
9008+ <reference ref="121093497"/>
9009+ </object>
9010+ <reference key="parent" ref="1053078401"/>
9011+ </object>
9012+ <object class="IBObjectRecord">
9013+ <int key="objectID">5809</int>
9014+ <reference key="object" ref="613962178"/>
9015+ <reference key="parent" ref="1036976683"/>
9016+ </object>
9017+ <object class="IBObjectRecord">
9018+ <int key="objectID">5810</int>
9019+ <reference key="object" ref="878990764"/>
9020+ <reference key="parent" ref="1036976683"/>
9021+ </object>
9022+ <object class="IBObjectRecord">
9023+ <int key="objectID">5811</int>
9024+ <reference key="object" ref="121093497"/>
9025+ <reference key="parent" ref="1036976683"/>
9026+ </object>
89709027 </object>
89719028 </object>
89729029 <object class="NSMutableDictionary" key="flattenedProperties">
@@ -9022,16 +9079,6 @@
90229079 <string>1478.ImportedFromIB2</string>
90239080 <string>1499.IBPluginDependency</string>
90249081 <string>1499.ImportedFromIB2</string>
9025- <string>1500.IBPluginDependency</string>
9026- <string>1500.ImportedFromIB2</string>
9027- <string>1501.IBPluginDependency</string>
9028- <string>1501.ImportedFromIB2</string>
9029- <string>1502.IBPluginDependency</string>
9030- <string>1502.ImportedFromIB2</string>
9031- <string>1503.IBPluginDependency</string>
9032- <string>1503.ImportedFromIB2</string>
9033- <string>1504.IBPluginDependency</string>
9034- <string>1504.ImportedFromIB2</string>
90359082 <string>1505.IBPluginDependency</string>
90369083 <string>1505.ImportedFromIB2</string>
90379084 <string>1506.IBPluginDependency</string>
@@ -9380,7 +9427,6 @@
93809427 <string>4579.ImportedFromIB2</string>
93819428 <string>4846.IBPluginDependency</string>
93829429 <string>4872.IBPluginDependency</string>
9383- <string>4873.IBPluginDependency</string>
93849430 <string>4874.IBPluginDependency</string>
93859431 <string>4875.IBPluginDependency</string>
93869432 <string>4876.IBPluginDependency</string>
@@ -9435,7 +9481,6 @@
94359481 <string>4951.IBPluginDependency</string>
94369482 <string>4952.IBPluginDependency</string>
94379483 <string>4953.IBPluginDependency</string>
9438- <string>4954.IBPluginDependency</string>
94399484 <string>4955.IBPluginDependency</string>
94409485 <string>4955.IBShouldRemoveOnLegacySave</string>
94419486 <string>4956.IBPluginDependency</string>
@@ -9611,6 +9656,10 @@
96119656 <string>5724.IBPluginDependency</string>
96129657 <string>58.IBPluginDependency</string>
96139658 <string>58.ImportedFromIB2</string>
9659+ <string>5808.IBPluginDependency</string>
9660+ <string>5809.IBPluginDependency</string>
9661+ <string>5810.IBPluginDependency</string>
9662+ <string>5811.IBPluginDependency</string>
96149663 <string>970.IBPluginDependency</string>
96159664 <string>970.ImportedFromIB2</string>
96169665 <string>971.IBPluginDependency</string>
@@ -9754,16 +9803,6 @@
97549803 <integer value="1"/>
97559804 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
97569805 <integer value="1"/>
9757- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
9758- <integer value="1"/>
9759- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
9760- <integer value="1"/>
9761- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
9762- <integer value="1"/>
9763- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
9764- <integer value="1"/>
9765- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
9766- <integer value="1"/>
97679806 <string>{{476, 687}, {253, 243}}</string>
97689807 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
97699808 <integer value="1"/>
@@ -9899,10 +9938,10 @@
98999938 <integer value="1"/>
99009939 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
99019940 <integer value="1"/>
9902- <string>{{329, 210}, {754, 556}}</string>
9941+ <string>{{-1188, 187}, {754, 556}}</string>
99039942 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
99049943 <boolean value="YES"/>
9905- <string>{{329, 210}, {754, 556}}</string>
9944+ <string>{{-1188, 187}, {754, 556}}</string>
99069945 <integer value="1"/>
99079946 <string>{{65, 541}, {760, 550}}</string>
99089947 <boolean value="NO"/>
@@ -10103,8 +10142,6 @@
1010310142 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1010410143 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1010510144 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
10106- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
10107- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1010810145 <integer value="1"/>
1010910146 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1011010147 <integer value="1"/>
@@ -10287,6 +10324,10 @@
1028710324 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1028810325 <integer value="1"/>
1028910326 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
10327+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
10328+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
10329+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
10330+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1029010331 <integer value="1"/>
1029110332 <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1029210333 <integer value="1"/>
@@ -10310,7 +10351,7 @@
1031010351 </object>
1031110352 </object>
1031210353 <nil key="sourceID"/>
10313- <int key="maxID">5793</int>
10354+ <int key="maxID">5816</int>
1031410355 </object>
1031510356 <object class="IBClassDescriber" key="IBDocument.Classes">
1031610357 <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -10529,8 +10570,6 @@
1052910570 <string>fVidQualitySlider</string>
1053010571 <string>fVidRateField</string>
1053110572 <string>fVidRatePopUp</string>
10532- <string>fVidTargetCell</string>
10533- <string>fVidTargetSizeField</string>
1053410573 <string>fVidTurboPassCheck</string>
1053510574 <string>fVidTwoPassCheck</string>
1053610575 <string>fVideoFiltersField</string>
@@ -10614,8 +10653,6 @@
1061410653 <string>NSSlider</string>
1061510654 <string>NSTextField</string>
1061610655 <string>NSPopUpButton</string>
10617- <string>NSButtonCell</string>
10618- <string>NSTextField</string>
1061910656 <string>NSButton</string>
1062010657 <string>NSButton</string>
1062110658 <string>NSTextField</string>
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -540,7 +540,6 @@
540540 };
541541 buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
542542 compatibilityVersion = "Xcode 3.1";
543- developmentRegion = English;
544543 hasScannedForEncodings = 1;
545544 knownRegions = (
546545 English,