diff options
| -rw-r--r-- | macosx/Controller.h | 12 | ||||
| -rw-r--r-- | macosx/Controller.m | 227 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.xib | 651 | ||||
| -rw-r--r-- | macosx/English.lproj/Preferences.xib | 379 | ||||
| -rw-r--r-- | macosx/HBAudio.m | 5 | ||||
| -rw-r--r-- | macosx/HBAudioController.m | 8 | ||||
| -rw-r--r-- | macosx/HBPreferencesController.m | 1 | ||||
| -rw-r--r-- | macosx/HBQueueController.mm | 83 |
8 files changed, 994 insertions, 372 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h index 58a8e2e00..62aad34dd 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -166,7 +166,17 @@ BOOL fIsDragging; /* New Audio box */ IBOutlet HBAudioController * fAudioDelegate; - + + /* New Audio Auto Passthru box */ + IBOutlet NSBox * fAudioAutoPassthruBox; + IBOutlet NSButton * fAudioAllowAACPassCheck; + IBOutlet NSButton * fAudioAllowAC3PassCheck; + IBOutlet NSButton * fAudioAllowDTSHDPassCheck; + IBOutlet NSButton * fAudioAllowDTSPassCheck; + IBOutlet NSButton * fAudioAllowMP3PassCheck; + IBOutlet NSButton * fAudioFallbackPopUp; + + /* Chapters box */ IBOutlet NSButton * fCreateChapterMarkers; IBOutlet NSTableView * fChapterTable; diff --git a/macosx/Controller.m b/macosx/Controller.m index 2c713dad1..86b949d05 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -570,6 +570,9 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It [fVidTurboPassCheck setEnabled: NO]; [fVidTurboPassCheck setState: NSOffState]; + /* Auto Passthru advanced options box */ + [fAudioAutoPassthruBox setHidden:NO]; + /* lets get our default prefs here */ [self getDefaultPresets:nil]; @@ -1047,6 +1050,16 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It [fQueueController setQueueArray: QueueFileArray]; [self getQueueStats]; + /* Update the visibility of the Auto Passthru advanced options box */ + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"ShowAdvancedOptsForAutoPassthru"] == YES) + { + [fAudioAutoPassthruBox setHidden:NO]; + } + else + { + [fAudioAutoPassthruBox setHidden:YES]; + } + } /* We use this to write messages to stderr from the macgui which show up in the activity window and log*/ @@ -2417,16 +2430,32 @@ fWorkingCount = 0; [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController grayscale]] forKey:@"VideoGrayScale"]; /* Auto Passthru */ - /* For the time being, values are hardcoded. */ - [queueFileJob setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowAACPass"]; - [queueFileJob setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowAC3Pass"]; - [queueFileJob setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowDTSHDPass"]; - [queueFileJob setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowDTSPass"]; - [queueFileJob setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowMP3Pass"]; - // just in case we need it for display purposes - [queueFileJob setObject: @"AC3 (ffmpeg)" forKey: @"AudioEncoderFallback"]; - // actual fallback encoder - [queueFileJob setObject: [NSNumber numberWithInt: HB_ACODEC_AC3] forKey: @"JobAudioEncoderFallback"]; + if ([fAudioAutoPassthruBox isHidden]) + { + // every passthru is allowed, fallback is AC3 + [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAACPass"]; + [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAC3Pass"]; + [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSHDPass"]; + [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSPass"]; + [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowMP3Pass"]; + // just in case we need it for display purposes + [queueFileJob setObject:@"AC3 (ffmpeg)" forKey: @"AudioEncoderFallback"]; + // actual fallback encoder + [queueFileJob setObject:[NSNumber numberWithInt:HB_ACODEC_AC3] forKey: @"JobAudioEncoderFallback"]; + + } + else + { + [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"]; + [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"]; + [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"]; + [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"]; + [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"]; + // just in case we need it for display purposes + [queueFileJob setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"]; + // actual fallback encoder + [queueFileJob setObject:[NSNumber numberWithInt:[[fAudioFallbackPopUp selectedItem] tag]] forKey: @"JobAudioEncoderFallback"]; + } /* Audio */ [self writeToActivityLog: "createQueueFileItem: Getting Audio from prepareAudioForQueueFileJob ..."]; @@ -2829,8 +2858,12 @@ fWorkingCount = 0; [fVidTurboPassCheck setState:[[queueToApply objectForKey:@"VideoTurboTwoPass"] intValue]]; /* Auto Passthru */ - /* For the time being, there are no GUI elements for this; - * everything is hardcoded. */ + [fAudioAllowAACPassCheck setState:[[queueToApply objectForKey:@"AudioAllowAACPass"] intValue]]; + [fAudioAllowAC3PassCheck setState:[[queueToApply objectForKey:@"AudioAllowAC3Pass"] intValue]]; + [fAudioAllowDTSHDPassCheck setState:[[queueToApply objectForKey:@"AudioAllowDTSHDPass"] intValue]]; + [fAudioAllowDTSPassCheck setState:[[queueToApply objectForKey:@"AudioAllowDTSPass"] intValue]]; + [fAudioAllowMP3PassCheck setState:[[queueToApply objectForKey:@"AudioAllowMP3Pass"] intValue]]; + [fAudioFallbackPopUp selectItemWithTitle:[queueToApply objectForKey:@"AudioEncoderFallback"]]; /* Audio */ /* Now lets add our new tracks to the audio list here */ @@ -3239,9 +3272,37 @@ bool one_burned = FALSE; /* Auto Passthru */ - /* For the time being, values are hardcoded. */ - job->acodec_copy_mask = HB_ACODEC_PASS_MASK; - job->acodec_fallback = HB_ACODEC_AC3; + if ([fAudioAutoPassthruBox isHidden]) + { + // every passthru is allowed, fallback is AC3 + job->acodec_copy_mask = HB_ACODEC_PASS_MASK; + job->acodec_fallback = HB_ACODEC_AC3; + } + else + { + job->acodec_copy_mask = 0; + if ([fAudioAllowAACPassCheck state] == NSOnState) + { + job->acodec_copy_mask |= HB_ACODEC_FFAAC; + } + if ([fAudioAllowAC3PassCheck state] == NSOnState) + { + job->acodec_copy_mask |= HB_ACODEC_AC3; + } + if ([fAudioAllowDTSHDPassCheck state] == NSOnState) + { + job->acodec_copy_mask |= HB_ACODEC_DCA_HD; + } + if ([fAudioAllowDTSPassCheck state] == NSOnState) + { + job->acodec_copy_mask |= HB_ACODEC_DCA; + } + if ([fAudioAllowMP3PassCheck state] == NSOnState) + { + job->acodec_copy_mask |= HB_ACODEC_MP3; + } + job->acodec_fallback = [[fAudioFallbackPopUp selectedItem] tag]; + } /* Audio tracks and mixdowns */ [fAudioDelegate prepareAudioForJob: job]; @@ -4540,20 +4601,20 @@ bool one_burned = FALSE; NSString * string = [fDstFile2Field stringValue]; int format = [fDstFormatPopUp indexOfSelectedItem]; char * ext = NULL; + NSMenuItem *menuItem; + int i; /* Initially set the large file (64 bit formatting) output checkbox to hidden */ [fDstMp4LargeFileCheck setHidden: YES]; [fDstMp4HttpOptFileCheck setHidden: YES]; [fDstMp4iPodFileCheck setHidden: YES]; - /* Update the Video Codec PopUp */ + /* Update the Video Codec Popup */ /* lets get the tag of the currently selected item first so we might reset it later */ int selectedVidEncoderTag; selectedVidEncoderTag = [[fVidEncoderPopUp selectedItem] tag]; /* Note: we now store the video encoder int values from common.c in the tags of each popup for easy retrieval later */ [fVidEncoderPopUp removeAllItems]; - NSMenuItem *menuItem; - int i; for( i = 0; i < hb_video_encoders_count; i++ ) { if( ( ( format == 0 ) && ( hb_video_encoders[i].muxers & HB_MUX_MP4 ) ) || @@ -4565,6 +4626,46 @@ bool one_burned = FALSE; } } + /* if we have a previously selected vid encoder tag, then try to select it */ + if (selectedVidEncoderTag) + { + [fVidEncoderPopUp selectItemWithTag: selectedVidEncoderTag]; + } + else + { + [fVidEncoderPopUp selectItemAtIndex: 0]; + } + + /* Update the Auto Passtgru Fallback Codec Popup */ + /* lets get the tag of the currently selected item first so we might reset it later */ + int selectedAutoPassthruFallbackEncoderTag; + selectedAutoPassthruFallbackEncoderTag = [[fAudioFallbackPopUp selectedItem] tag]; + + [fAudioFallbackPopUp removeAllItems]; + for( i = 0; i < hb_audio_encoders_count; i++ ) + { + if( !( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) && + ( ( ( format == 0 ) && ( hb_audio_encoders[i].muxers & HB_MUX_MP4 ) ) || + ( ( format == 1 ) && ( hb_audio_encoders[i].muxers & HB_MUX_MKV ) ) ) ) + { + menuItem = [[fAudioFallbackPopUp menu] addItemWithTitle: [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name] + action: NULL keyEquivalent: @""]; + [menuItem setTag: hb_audio_encoders[i].encoder]; + } + } + + /* if we have a previously selected auto passthru fallback encoder tag, then try to select it */ + if (selectedAutoPassthruFallbackEncoderTag) + { + selectedAutoPassthruFallbackEncoderTag = [fAudioFallbackPopUp selectItemWithTag: selectedAutoPassthruFallbackEncoderTag]; + } + /* if we had no previous fallback selected OR if selection failed + * select the default fallback encoder (AC3) */ + if (!selectedAutoPassthruFallbackEncoderTag) + { + [fAudioFallbackPopUp selectItemWithTag: HB_ACODEC_AC3]; + } + switch( format ) { case 0: @@ -4596,17 +4697,6 @@ bool one_burned = FALSE; userInfo: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: [[fDstFormatPopUp selectedItem] tag]], keyContainerTag, nil]]]; - - /* if we have a previously selected vid encoder tag, then try to select it */ - if (selectedVidEncoderTag) - { - [fVidEncoderPopUp selectItemWithTag: selectedVidEncoderTag]; - } - else - { - [fVidEncoderPopUp selectItemAtIndex: 0]; - } - if( format == 0 ) [self autoSetM4vExtension: sender]; @@ -5651,8 +5741,57 @@ return YES; [fVidTurboPassCheck setState:[[chosenPreset objectForKey:@"VideoTurboTwoPass"] intValue]]; /* Auto Passthru */ - /* For the time being, there are no GUI elements for this; - * everything is hardcoded. */ + /* If the preset has Auto Passthru fields, use them; + * else assume every passthru is allowed and the fallback is AC3 */ + id tempObject; + if ((tempObject = [chosenPreset objectForKey:@"AudioAllowAACPass"]) != nil) + { + [fAudioAllowAACPassCheck setState:[tempObject intValue]]; + } + else + { + [fAudioAllowAACPassCheck setState:NSOnState]; + } + if ((tempObject = [chosenPreset objectForKey:@"AudioAllowAC3Pass"]) != nil) + { + [fAudioAllowAC3PassCheck setState:[tempObject intValue]]; + } + else + { + [fAudioAllowAC3PassCheck setState:NSOnState]; + } + if ((tempObject = [chosenPreset objectForKey:@"AudioAllowDTSHDPass"]) != nil) + { + [fAudioAllowDTSHDPassCheck setState:[tempObject intValue]]; + } + else + { + [fAudioAllowDTSHDPassCheck setState:NSOnState]; + } + if ((tempObject = [chosenPreset objectForKey:@"AudioAllowDTSPass"]) != nil) + { + [fAudioAllowDTSPassCheck setState:[tempObject intValue]]; + } + else + { + [fAudioAllowDTSPassCheck setState:NSOnState]; + } + if ((tempObject = [chosenPreset objectForKey:@"AudioAllowMP3Pass"]) != nil) + { + [fAudioAllowMP3PassCheck setState:[tempObject intValue]]; + } + else + { + [fAudioAllowMP3PassCheck setState:NSOnState]; + } + if ((tempObject = [chosenPreset objectForKey:@"AudioEncoderFallback"]) != nil) + { + [fAudioFallbackPopUp selectItemWithTitle:tempObject]; + } + else + { + [fAudioFallbackPopUp selectItemWithTitle:@"AC3 (ffmpeg)"]; + } /* Audio */ [fAudioDelegate addTracksFromPreset: chosenPreset]; @@ -6175,13 +6314,25 @@ return YES; [preset setObject:[NSNumber numberWithInt:[fPictureController grayscale]] forKey:@"VideoGrayScale"]; /* Auto Pasthru */ - /* For the time being, values are hardcoded. */ - [preset setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowAACPass"]; - [preset setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowAC3Pass"]; - [preset setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowDTSHDPass"]; - [preset setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowDTSPass"]; - [preset setObject: [NSNumber numberWithInt: 1] forKey: @"AudioAllowMP3Pass"]; - [preset setObject: @"AC3 (ffmpeg)" forKey: @"AudioEncoderFallback"]; + if ([fAudioAutoPassthruBox isHidden]) + { + // every passthru is allowed, fallback is AC3 + [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAACPass"]; + [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAC3Pass"]; + [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSHDPass"]; + [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSPass"]; + [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowMP3Pass"]; + [preset setObject:@"AC3 (ffmpeg)" forKey: @"AudioEncoderFallback"]; + } + else + { + [preset setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"]; + [preset setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"]; + [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"]; + [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"]; + [preset setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"]; + [preset setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"]; + } /* Audio */ NSMutableArray *audioListArray = [[NSMutableArray alloc] init]; diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index c05c67e61..7ab1be7d3 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -973,7 +973,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSTableView" id="792464451"> <reference key="NSNextResponder" ref="528259747"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{884, 241}</string> + <string key="NSFrameSize">{884, 236}</string> <reference key="NSSuperview" ref="528259747"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="496546489"/> @@ -988,9 +988,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSTableView" ref="792464451"/> </object> <object class="_NSCornerView" key="NSCornerView" id="727606062"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="933946879"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> + <reference key="NSSuperview" ref="933946879"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="230332532"/> </object> <object class="NSMutableArray" key="NSTableColumns"> @@ -1435,7 +1437,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSTableViewGroupRowStyle">1</int> </object> </object> - <string key="NSFrame">{{1, 17}, {884, 241}}</string> + <string key="NSFrame">{{1, 17}, {884, 236}}</string> <reference key="NSSuperview" ref="933946879"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="792464451"/> @@ -1482,8 +1484,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSBGColor" ref="355843302"/> <int key="NScvFlags">4</int> </object> + <reference ref="727606062"/> </object> - <string key="NSFrame">{{17, 17}, {886, 259}}</string> + <string key="NSFrame">{{17, 17}, {886, 254}}</string> <reference key="NSSuperview" ref="577274772"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="528259747"/> @@ -1492,6 +1495,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSHScroller" ref="821562152"/> <reference key="NSContentView" ref="528259747"/> <reference key="NSHeaderClipView" ref="230332532"/> + <reference key="NSCornerView" ref="727606062"/> <bytes key="NSScrollAmts">QSAAAEEgAABB2AAAQdgAAA</bytes> </object> <object class="NSButton" id="883603583"> @@ -1500,7 +1504,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="NSFrame">{{16, 282}, {116, 16}}</string> <reference key="NSSuperview" ref="577274772"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="933946879"/> + <reference key="NSNextKeyView" ref="334448622"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="327570663"> <int key="NSCellFlags">67239424</int> @@ -1516,8 +1520,285 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSPeriodicInterval">25</int> </object> </object> + <object class="NSBox" id="334448622"> + <reference key="NSNextResponder" ref="577274772"/> + <int key="NSvFlags">12</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="754802956"> + <reference key="NSNextResponder" ref="334448622"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="162512199"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{85, 8}, {41, 18}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="354328979"/> + <string key="NSReuseIdentifierKey">_NS:771</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="707344957"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">262144</int> + <string key="NSContents">MP3</string> + <reference key="NSSupport" ref="22"/> + <string key="NSCellIdentifier">_NS:771</string> + <reference key="NSControlView" ref="162512199"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="887198214"/> + <reference key="NSAlternateImage" ref="624832340"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="354328979"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{130, 8}, {47, 18}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="453548414"/> + <string key="NSReuseIdentifierKey">_NS:771</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="243873688"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">262144</int> + <string key="NSContents">AAC</string> + <reference key="NSSupport" ref="22"/> + <string key="NSCellIdentifier">_NS:771</string> + <reference key="NSControlView" ref="354328979"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="887198214"/> + <reference key="NSAlternateImage" ref="624832340"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="453548414"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{179, 8}, {47, 18}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="485809563"/> + <string key="NSReuseIdentifierKey">_NS:771</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="368344404"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">262144</int> + <string key="NSContents">AC3</string> + <reference key="NSSupport" ref="22"/> + <string key="NSCellIdentifier">_NS:771</string> + <reference key="NSControlView" ref="453548414"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="887198214"/> + <reference key="NSAlternateImage" ref="624832340"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="485809563"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{226, 8}, {48, 18}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1024961404"/> + <string key="NSReuseIdentifierKey">_NS:771</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="118300837"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">262144</int> + <string key="NSContents">DTS</string> + <reference key="NSSupport" ref="22"/> + <string key="NSCellIdentifier">_NS:771</string> + <reference key="NSControlView" ref="485809563"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="887198214"/> + <reference key="NSAlternateImage" ref="624832340"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1024961404"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{271, 8}, {58, 18}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="431725280"/> + <string key="NSReuseIdentifierKey">_NS:771</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="735750065"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">262144</int> + <string key="NSContents">DTS-HD</string> + <reference key="NSSupport" ref="22"/> + <string key="NSCellIdentifier">_NS:771</string> + <reference key="NSControlView" ref="1024961404"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="887198214"/> + <reference key="NSAlternateImage" ref="624832340"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSPopUpButton" id="586044455"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{442, 8}, {100, 15}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="933946879"/> + <string key="NSReuseIdentifierKey">_NS:868</string> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="141259846"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">264192</int> + <reference key="NSSupport" ref="22"/> + <string key="NSCellIdentifier">_NS:868</string> + <reference key="NSControlView" ref="586044455"/> + <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="394026679"> + <reference key="NSMenu" ref="458538409"/> + <string key="NSTitle">AC3 (ffmpeg)</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <reference key="NSOnImage" ref="447995298"/> + <reference key="NSMixedImage" ref="760317610"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="141259846"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="458538409"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="394026679"/> + <object class="NSMenuItem" id="797157934"> + <reference key="NSMenu" ref="458538409"/> + <string key="NSTitle">Item 2</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="447995298"/> + <reference key="NSMixedImage" ref="760317610"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="141259846"/> + </object> + <object class="NSMenuItem" id="4616658"> + <reference key="NSMenu" ref="458538409"/> + <string key="NSTitle">Item 3</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="447995298"/> + <reference key="NSMixedImage" ref="760317610"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="141259846"/> + </object> + </object> + <reference key="NSMenuFont" ref="273283760"/> + </object> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">2</int> + </object> + </object> + <object class="NSTextField" id="1010907474"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">264</int> + <string key="NSFrame">{{2, -7}, {78, 28}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="162512199"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="935575109"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71565312</int> + <string key="NSContents">Auto Passthru:</string> + <reference key="NSSupport" ref="22"/> + <reference key="NSControlView" ref="1010907474"/> + <reference key="NSBackgroundColor" ref="242973447"/> + <reference key="NSTextColor" ref="701609070"/> + </object> + </object> + <object class="NSTextField" id="431725280"> + <reference key="NSNextResponder" ref="754802956"/> + <int key="NSvFlags">264</int> + <string key="NSFrame">{{354, 7}, {86, 14}}</string> + <reference key="NSSuperview" ref="754802956"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="586044455"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="121164790"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">71565312</int> + <string key="NSContents">Passthru Fallback:</string> + <reference key="NSSupport" ref="22"/> + <reference key="NSControlView" ref="431725280"/> + <reference key="NSBackgroundColor" ref="242973447"/> + <reference key="NSTextColor" ref="701609070"/> + </object> + </object> + </object> + <string key="NSFrame">{{1, 1}, {552, 29}}</string> + <reference key="NSSuperview" ref="334448622"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1010907474"/> + <string key="NSReuseIdentifierKey">_NS:21</string> + </object> + </object> + <string key="NSFrame">{{349, 275}, {554, 31}}</string> + <reference key="NSSuperview" ref="577274772"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="754802956"/> + <string key="NSReuseIdentifierKey">_NS:18</string> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Auto Passthru</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="138233214"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> + </object> + </object> + <reference key="NSContentView" ref="754802956"/> + <int key="NSBorderType">1</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> + </object> </object> - <string key="NSFrameSize">{920, 305}</string> + <string key="NSFrame">{{0, -3}, {920, 305}}</string> <reference key="NSSuperview" ref="738554558"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="883603583"/> @@ -3066,7 +3347,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="586321835"/> </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -3878,7 +4159,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <string key="NSFrameSize">{300, 233}</string> </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -4563,7 +4844,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <string key="NSFrameSize">{338, 318}</string> </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{338, 254}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -4747,7 +5028,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <string key="NSFrameSize">{392, 144}</string> </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -6146,6 +6427,62 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioAllowMP3PassCheck</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="162512199"/> + </object> + <int key="connectionID">5925</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioAllowAACPassCheck</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="354328979"/> + </object> + <int key="connectionID">5926</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioAllowAC3PassCheck</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="453548414"/> + </object> + <int key="connectionID">5927</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioAllowDTSPassCheck</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="485809563"/> + </object> + <int key="connectionID">5928</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioAllowDTSHDPassCheck</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="1024961404"/> + </object> + <int key="connectionID">5929</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioFallbackPopUp</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="586044455"/> + </object> + <int key="connectionID">5930</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fAudioAutoPassthruBox</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="334448622"/> + </object> + <int key="connectionID">5931</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> <string key="label">parentWindow</string> <reference key="source" ref="972647787"/> <reference key="destination" ref="192660081"/> @@ -9242,6 +9579,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="883603583"/> <reference ref="933946879"/> + <reference ref="334448622"/> </object> <reference key="parent" ref="738554558"/> </object> @@ -9592,6 +9930,164 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="object" ref="586026952"/> <reference key="parent" ref="0"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">5920</int> + <reference key="object" ref="334448622"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1024961404"/> + <reference ref="485809563"/> + <reference ref="453548414"/> + <reference ref="354328979"/> + <reference ref="162512199"/> + <reference ref="586044455"/> + <reference ref="1010907474"/> + <reference ref="431725280"/> + </object> + <reference key="parent" ref="577274772"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5904</int> + <reference key="object" ref="162512199"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="707344957"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5905</int> + <reference key="object" ref="707344957"/> + <reference key="parent" ref="162512199"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5906</int> + <reference key="object" ref="354328979"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="243873688"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5907</int> + <reference key="object" ref="243873688"/> + <reference key="parent" ref="354328979"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5908</int> + <reference key="object" ref="453548414"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="368344404"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5909</int> + <reference key="object" ref="368344404"/> + <reference key="parent" ref="453548414"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5910</int> + <reference key="object" ref="485809563"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="118300837"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5911</int> + <reference key="object" ref="118300837"/> + <reference key="parent" ref="485809563"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5912</int> + <reference key="object" ref="1024961404"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="735750065"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5913</int> + <reference key="object" ref="735750065"/> + <reference key="parent" ref="1024961404"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5914</int> + <reference key="object" ref="586044455"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="141259846"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5915</int> + <reference key="object" ref="141259846"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="458538409"/> + </object> + <reference key="parent" ref="586044455"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5916</int> + <reference key="object" ref="458538409"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="4616658"/> + <reference ref="797157934"/> + <reference ref="394026679"/> + </object> + <reference key="parent" ref="141259846"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5919</int> + <reference key="object" ref="4616658"/> + <reference key="parent" ref="458538409"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5918</int> + <reference key="object" ref="797157934"/> + <reference key="parent" ref="458538409"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5917</int> + <reference key="object" ref="394026679"/> + <reference key="parent" ref="458538409"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5921</int> + <reference key="object" ref="1010907474"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="935575109"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5922</int> + <reference key="object" ref="935575109"/> + <reference key="parent" ref="1010907474"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5923</int> + <reference key="object" ref="431725280"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="121164790"/> + </object> + <reference key="parent" ref="334448622"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5924</int> + <reference key="object" ref="121164790"/> + <reference key="parent" ref="431725280"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -9994,6 +10490,27 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>5874.IBPluginDependency</string> <string>5879.IBPluginDependency</string> <string>5897.IBPluginDependency</string> + <string>5904.IBPluginDependency</string> + <string>5905.IBPluginDependency</string> + <string>5906.IBPluginDependency</string> + <string>5907.IBPluginDependency</string> + <string>5908.IBPluginDependency</string> + <string>5909.IBPluginDependency</string> + <string>5910.IBPluginDependency</string> + <string>5911.IBPluginDependency</string> + <string>5912.IBPluginDependency</string> + <string>5913.IBPluginDependency</string> + <string>5914.IBPluginDependency</string> + <string>5915.IBPluginDependency</string> + <string>5916.IBPluginDependency</string> + <string>5917.IBPluginDependency</string> + <string>5918.IBPluginDependency</string> + <string>5919.IBPluginDependency</string> + <string>5920.IBPluginDependency</string> + <string>5921.IBPluginDependency</string> + <string>5922.IBPluginDependency</string> + <string>5923.IBPluginDependency</string> + <string>5924.IBPluginDependency</string> <string>970.IBPluginDependency</string> <string>971.IBPluginDependency</string> <string>973.IBPluginDependency</string> @@ -10427,6 +10944,27 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -10441,7 +10979,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="dict.values" ref="0"/> </object> <nil key="sourceID"/> - <int key="maxID">5903</int> + <int key="maxID">5931</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -10449,17 +10987,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="IBPartialClassDescription"> <string key="className">HBAudioController</string> <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">myController</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">myController</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">myController</string> - <string key="candidateClassName">id</string> - </object> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">./Classes/HBAudioController.h</string> @@ -10507,7 +11034,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>openHomepage:</string> <string>openMainWindow:</string> <string>openUserGuide:</string> - <string>presetSelected:</string> <string>qualitySliderChanged:</string> <string>revertPictureSizeToMax:</string> <string>selectDefaultPreset:</string> @@ -10521,7 +11047,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>showPreferencesWindow:</string> <string>showPreviewWindow:</string> <string>showQueueWindow:</string> - <string>showScanPanel:</string> <string>showSourceTitleScanPanel:</string> <string>startEndFrameValueChanged:</string> <string>startEndSecValueChanged:</string> @@ -10589,8 +11114,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -10632,7 +11155,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>openHomepage:</string> <string>openMainWindow:</string> <string>openUserGuide:</string> - <string>presetSelected:</string> <string>qualitySliderChanged:</string> <string>revertPictureSizeToMax:</string> <string>selectDefaultPreset:</string> @@ -10646,7 +11168,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>showPreferencesWindow:</string> <string>showPreviewWindow:</string> <string>showQueueWindow:</string> - <string>showScanPanel:</string> <string>showSourceTitleScanPanel:</string> <string>startEndFrameValueChanged:</string> <string>startEndSecValueChanged:</string> @@ -10799,10 +11320,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">presetSelected:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> <string key="name">qualitySliderChanged:</string> <string key="candidateClassName">id</string> </object> @@ -10855,10 +11372,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">showScanPanel:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> <string key="name">showSourceTitleScanPanel:</string> <string key="candidateClassName">id</string> </object> @@ -10898,7 +11411,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <string>fAddPresetPanel</string> <string>fAdvancedView</string> - <string>fAudioDelegate</string> + <string>fAudioAllowAACPassCheck</string> + <string>fAudioAllowAC3PassCheck</string> + <string>fAudioAllowDTSHDPassCheck</string> + <string>fAudioAllowDTSPassCheck</string> + <string>fAudioAllowMP3PassCheck</string> + <string>fAudioAutoPassthruBox</string> + <string>fAudioFallbackPopUp</string> <string>fBrowseSrtFileButton</string> <string>fChapterTable</string> <string>fChapterTableNameColumn</string> @@ -10916,7 +11435,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>fFramerateMatrix</string> <string>fFramerateVfrPfrCell</string> <string>fLoadChaptersButton</string> - <string>fOpenSourceTitleMMenu</string> <string>fPictureCroppingField</string> <string>fPictureSizeField</string> <string>fPresetDrawer</string> @@ -10979,13 +11497,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>fVidTwoPassCheck</string> <string>fVideoFiltersField</string> <string>fWindow</string> - <string>tableView</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSPanel</string> <string>NSBox</string> - <string>HBAudioController</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSBox</string> + <string>NSButton</string> <string>NSButton</string> <string>NSTableView</string> <string>NSTableColumn</string> @@ -11003,7 +11526,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>NSMatrix</string> <string>NSButtonCell</string> <string>NSButton</string> - <string>NSMenuItem</string> <string>NSTextField</string> <string>NSTextField</string> <string>NSDrawer</string> @@ -11066,7 +11588,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>NSButton</string> <string>NSTextField</string> <string>NSWindow</string> - <string>NSTableView</string> </object> </object> <object class="NSMutableDictionary" key="toOneOutletInfosByName"> @@ -11075,7 +11596,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <string>fAddPresetPanel</string> <string>fAdvancedView</string> - <string>fAudioDelegate</string> + <string>fAudioAllowAACPassCheck</string> + <string>fAudioAllowAC3PassCheck</string> + <string>fAudioAllowDTSHDPassCheck</string> + <string>fAudioAllowDTSPassCheck</string> + <string>fAudioAllowMP3PassCheck</string> + <string>fAudioAutoPassthruBox</string> + <string>fAudioFallbackPopUp</string> <string>fBrowseSrtFileButton</string> <string>fChapterTable</string> <string>fChapterTableNameColumn</string> @@ -11093,7 +11620,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>fFramerateMatrix</string> <string>fFramerateVfrPfrCell</string> <string>fLoadChaptersButton</string> - <string>fOpenSourceTitleMMenu</string> <string>fPictureCroppingField</string> <string>fPictureSizeField</string> <string>fPresetDrawer</string> @@ -11156,7 +11682,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>fVidTwoPassCheck</string> <string>fVideoFiltersField</string> <string>fWindow</string> - <string>tableView</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -11169,8 +11694,32 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">NSBox</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">fAudioDelegate</string> - <string key="candidateClassName">HBAudioController</string> + <string key="name">fAudioAllowAACPassCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioAllowAC3PassCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioAllowDTSHDPassCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioAllowDTSPassCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioAllowMP3PassCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioAutoPassthruBox</string> + <string key="candidateClassName">NSBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioFallbackPopUp</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">fBrowseSrtFileButton</string> @@ -11241,10 +11790,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">fOpenSourceTitleMMenu</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">fPictureCroppingField</string> <string key="candidateClassName">NSTextField</string> </object> @@ -11492,10 +12037,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="name">fWindow</string> <string key="candidateClassName">NSWindow</string> </object> - <object class="IBToOneOutletInfo"> - <string key="name">tableView</string> - <string key="candidateClassName">NSTableView</string> - </object> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib index 7d4d4fd57..c87dd61a7 100644 --- a/macosx/English.lproj/Preferences.xib +++ b/macosx/English.lproj/Preferences.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10K549</string> - <string key="IBDocument.InterfaceBuilderVersion">1306</string> - <string key="IBDocument.AppKitVersion">1038.36</string> - <string key="IBDocument.HIToolboxVersion">461.00</string> + <string key="IBDocument.SystemVersion">11C74</string> + <string key="IBDocument.InterfaceBuilderVersion">1938</string> + <string key="IBDocument.AppKitVersion">1138.23</string> + <string key="IBDocument.HIToolboxVersion">567.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">1306</string> + <string key="NS.object.0">1938</string> </object> <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -33,11 +33,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <reference key="dict.values" ref="0"/> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="185275739"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -60,23 +57,26 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="496214002"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{7, 11}, {500, 200}}</string> + <string key="NSFrameSize">{500, 200}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView"/> </object> - <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{1e+13, 1e+13}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> <object class="NSUserDefaultsController" id="580534391"> <bool key="NSSharedInstance">YES</bool> </object> <object class="NSCustomView" id="1048779201"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -85,7 +85,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{123, 113}, {195, 22}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1009109497"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="630285587"> @@ -201,7 +200,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{123, 90}, {313, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="597305137"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="878201725"> @@ -230,7 +228,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{345, 71}, {96, 16}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="713240777"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="725806271"> @@ -256,7 +253,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{209, 73}, {125, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="806259169"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="456853603"> @@ -290,7 +286,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{123, 220}, {133, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="280291731"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="448858755"> @@ -313,7 +308,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{125, 38}, {303, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="854927877"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="419322096"> @@ -336,7 +330,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{52, 117}, {69, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="23412822"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="718672066"> @@ -354,7 +347,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{123, 175}, {194, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="954667708"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="824062726"> @@ -377,7 +369,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{123, 71}, {86, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="842132572"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="437495050"> @@ -401,7 +392,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{62, 222}, {59, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="636306431"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="404194395"> @@ -419,7 +409,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{125, 20}, {134, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="317169558"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="177949206"> @@ -437,7 +426,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{141, 199}, {95, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="54712339"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1049782015"> @@ -455,7 +443,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{52, 40}, {71, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="965044526"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="947435557"> @@ -473,8 +460,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{263, 19}, {66, 15}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="792374025"> <int key="NSCellFlags">71433792</int> @@ -549,7 +534,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{141, 148}, {102, 22}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="315188467"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="841218599"> @@ -629,7 +613,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{238, 194}, {205, 22}}</string> <reference key="NSSuperview" ref="1048779201"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="581738572"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="310956178"> @@ -699,8 +682,6 @@ </object> </object> <string key="NSFrameSize">{460, 256}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="576686737"/> <string key="NSClassName">NSView</string> <string key="NSExtension">NSControl</string> @@ -732,15 +713,17 @@ <string key="NSExtension">NSResponder</string> </object> <object class="NSCustomView" id="332598366"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTextField" id="389101877"> <reference key="NSNextResponder" ref="332598366"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{30, 56}, {96, 14}}</string> + <string key="NSFrame">{{30, 78}, {96, 14}}</string> <reference key="NSSuperview" ref="332598366"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="172081130"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="459708758"> <int key="NSCellFlags">67239424</int> @@ -755,8 +738,10 @@ <object class="NSTextField" id="247298122"> <reference key="NSNextResponder" ref="332598366"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{95, 22}, {31, 14}}</string> + <string key="NSFrame">{{95, 44}, {31, 14}}</string> <reference key="NSSuperview" ref="332598366"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1054432492"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="954547948"> <int key="NSCellFlags">67239424</int> @@ -771,8 +756,10 @@ <object class="NSComboBox" id="172081130"> <reference key="NSNextResponder" ref="332598366"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{131, 50}, {247, 22}}</string> + <string key="NSFrame">{{131, 72}, {247, 22}}</string> <reference key="NSSuperview" ref="332598366"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="247298122"/> <bool key="NSEnabled">YES</bool> <object class="NSComboBoxCell" key="NSCell" id="210320026"> <int key="NSCellFlags">343014976</int> @@ -972,7 +959,6 @@ <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn"> - <integer value="0" key="NSIdentifier"/> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">1000</double> @@ -1035,20 +1021,23 @@ <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> </object> </object> </object> <object class="NSButton" id="168948265"> <reference key="NSNextResponder" ref="332598366"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{18, -4}, {472, 18}}</string> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{96, 7}, {292, 26}}</string> <reference key="NSSuperview" ref="332598366"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="686321393"> - <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">If sources native language is not your preferred language, use subtitles</string> - <reference key="NSSupport" ref="964910696"/> + <string key="NSContents">Show advanced options for Auto Passthru</string> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="168948265"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> @@ -1062,8 +1051,10 @@ <object class="NSButton" id="1054432492"> <reference key="NSNextResponder" ref="332598366"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{128, 20}, {333, 18}}</string> + <string key="NSFrame">{{128, 42}, {333, 18}}</string> <reference key="NSSuperview" ref="332598366"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="168948265"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="787274685"> <int key="NSCellFlags">-2080244224</int> @@ -1082,7 +1073,10 @@ </object> </object> </object> - <string key="NSFrameSize">{492, 91}</string> + <string key="NSFrameSize">{492, 113}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="389101877"/> <object class="NSMutableString" key="NSClassName"> <characters key="NS.bytes">NSView</characters> </object> @@ -1532,14 +1526,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="123373831"/> - <reference key="destination" ref="169862212"/> - </object> - <int key="connectionID">185</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">window</string> <reference key="source" ref="169862212"/> <reference key="destination" ref="123373831"/> @@ -1579,6 +1565,30 @@ <int key="connectionID">248</int> </object> <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">browseSendToApp:</string> + <reference key="source" ref="169862212"/> + <reference key="destination" ref="806259169"/> + </object> + <int key="connectionID">455</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fSendEncodeToAppField</string> + <reference key="source" ref="169862212"/> + <reference key="destination" ref="842132572"/> + </object> + <int key="connectionID">456</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="123373831"/> + <reference key="destination" ref="169862212"/> + </object> + <int key="connectionID">185</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: values.DefaultPresetsDrawerShow</string> <reference key="source" ref="636306431"/> @@ -1612,6 +1622,22 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> + <string key="label">value: automaticallyChecksForUpdates</string> + <reference key="source" ref="581738572"/> + <reference key="destination" ref="413269307"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="581738572"/> + <reference key="NSDestination" ref="413269307"/> + <string key="NSLabel">value: automaticallyChecksForUpdates</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">automaticallyChecksForUpdates</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">429</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> <string key="label">value: values.sendToMetaX</string> <reference key="source" ref="597305137"/> <reference key="destination" ref="580534391"/> @@ -1644,19 +1670,35 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.PreferredLanguageSubtitles</string> + <string key="label">value: values.ShowAdvancedOptsForAutoPassthru</string> <reference key="source" ref="168948265"/> <reference key="destination" ref="580534391"/> <object class="NSNibBindingConnector" key="connector"> <reference key="NSSource" ref="168948265"/> <reference key="NSDestination" ref="580534391"/> - <string key="NSLabel">value: values.PreferredLanguageSubtitles</string> + <string key="NSLabel">value: values.ShowAdvancedOptsForAutoPassthru</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.PreferredLanguageSubtitles</string> + <string key="NSKeyPath">values.ShowAdvancedOptsForAutoPassthru</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">271</int> + <int key="connectionID">502</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">selectedValue: values.DefaultMpegExtension</string> + <reference key="source" ref="317169558"/> + <reference key="destination" ref="580534391"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="317169558"/> + <reference key="NSDestination" ref="580534391"/> + <string key="NSLabel">selectedValue: values.DefaultMpegExtension</string> + <string key="NSBinding">selectedValue</string> + <string key="NSKeyPath">values.DefaultMpegExtension</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">490</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> @@ -1788,22 +1830,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: automaticallyChecksForUpdates</string> - <reference key="source" ref="581738572"/> - <reference key="destination" ref="413269307"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="581738572"/> - <reference key="NSDestination" ref="413269307"/> - <string key="NSLabel">value: automaticallyChecksForUpdates</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">automaticallyChecksForUpdates</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">429</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">enabled: automaticallyChecksForUpdates</string> <reference key="source" ref="954667708"/> <reference key="destination" ref="413269307"/> @@ -1837,10 +1863,10 @@ <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: values.SendCompletedEncodeToApp</string> - <reference key="source" ref="456853603"/> + <reference key="source" ref="842132572"/> <reference key="destination" ref="580534391"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="456853603"/> + <reference key="NSSource" ref="842132572"/> <reference key="NSDestination" ref="580534391"/> <string key="NSLabel">value: values.SendCompletedEncodeToApp</string> <string key="NSBinding">value</string> @@ -1848,15 +1874,15 @@ <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">453</int> + <int key="connectionID">454</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: values.SendCompletedEncodeToApp</string> - <reference key="source" ref="842132572"/> + <reference key="source" ref="456853603"/> <reference key="destination" ref="580534391"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="842132572"/> + <reference key="NSSource" ref="456853603"/> <reference key="NSDestination" ref="580534391"/> <string key="NSLabel">value: values.SendCompletedEncodeToApp</string> <string key="NSBinding">value</string> @@ -1864,23 +1890,7 @@ <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">454</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">browseSendToApp:</string> - <reference key="source" ref="169862212"/> - <reference key="destination" ref="806259169"/> - </object> - <int key="connectionID">455</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">fSendEncodeToAppField</string> - <reference key="source" ref="169862212"/> - <reference key="destination" ref="842132572"/> - </object> - <int key="connectionID">456</int> + <int key="connectionID">453</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> @@ -1916,22 +1926,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">selectedValue: values.DefaultMpegExtension</string> - <reference key="source" ref="317169558"/> - <reference key="destination" ref="580534391"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="317169558"/> - <reference key="NSDestination" ref="580534391"/> - <string key="NSLabel">selectedValue: values.DefaultMpegExtension</string> - <string key="NSBinding">selectedValue</string> - <string key="NSKeyPath">values.DefaultMpegExtension</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">490</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">selectedValue: values.AlertWhenDone</string> <reference key="source" ref="23412822"/> <reference key="destination" ref="580534391"/> @@ -1952,7 +1946,9 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <reference key="object" ref="0"/> + <object class="NSArray" key="object" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <reference key="children" ref="185275739"/> <nil key="parent"/> </object> @@ -2102,10 +2098,10 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="389101877"/> - <reference ref="168948265"/> <reference ref="172081130"/> <reference ref="247298122"/> <reference ref="1054432492"/> + <reference ref="168948265"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Audio</string> @@ -2832,49 +2828,23 @@ <string>-1.IBPluginDependency</string> <string>-2.IBPluginDependency</string> <string>-3.IBPluginDependency</string> - <string>233.IBEditorWindowLastContentRect</string> <string>233.IBPluginDependency</string> - <string>233.IBViewEditorWindowController.showingLayoutRectangles</string> - <string>233.ImportedFromIB2</string> - <string>233.editorWindowContentRectSynchronizationRect</string> - <string>234.IBEditorWindowLastContentRect</string> <string>234.IBPluginDependency</string> - <string>234.ImportedFromIB2</string> - <string>234.editorWindowContentRectSynchronizationRect</string> - <string>235.IBEditorWindowLastContentRect</string> <string>235.IBPluginDependency</string> - <string>235.ImportedFromIB2</string> - <string>236.IBEditorWindowLastContentRect</string> <string>236.IBPluginDependency</string> - <string>236.ImportedFromIB2</string> - <string>236.editorWindowContentRectSynchronizationRect</string> <string>238.IBPluginDependency</string> - <string>238.ImportedFromIB2</string> <string>239.IBPluginDependency</string> - <string>239.ImportedFromIB2</string> <string>242.IBPluginDependency</string> - <string>242.ImportedFromIB2</string> <string>243.IBPluginDependency</string> - <string>243.ImportedFromIB2</string> <string>244.IBPluginDependency</string> - <string>244.ImportedFromIB2</string> <string>252.IBPluginDependency</string> - <string>252.ImportedFromIB2</string> <string>253.IBPluginDependency</string> - <string>253.ImportedFromIB2</string> <string>254.IBPluginDependency</string> - <string>254.ImportedFromIB2</string> <string>275.IBPluginDependency</string> - <string>275.ImportedFromIB2</string> <string>276.IBPluginDependency</string> - <string>276.ImportedFromIB2</string> <string>289.IBPluginDependency</string> - <string>289.ImportedFromIB2</string> - <string>290.IBEditorWindowLastContentRect</string> <string>290.IBPluginDependency</string> - <string>290.ImportedFromIB2</string> <string>292.IBPluginDependency</string> - <string>292.ImportedFromIB2</string> <string>301.IBPluginDependency</string> <string>302.IBPluginDependency</string> <string>304.IBPluginDependency</string> @@ -2889,107 +2859,76 @@ <string>326.IBPluginDependency</string> <string>327.IBPluginDependency</string> <string>347.IBPluginDependency</string> - <string>347.ImportedFromIB2</string> <string>348.IBPluginDependency</string> <string>350.IBPluginDependency</string> - <string>350.ImportedFromIB2</string> <string>351.IBPluginDependency</string> <string>352.IBPluginDependency</string> <string>353.IBPluginDependency</string> - <string>354.IBEditorWindowLastContentRect</string> <string>354.IBPluginDependency</string> <string>355.IBPluginDependency</string> <string>356.IBPluginDependency</string> <string>357.IBPluginDependency</string> <string>359.IBPluginDependency</string> - <string>359.ImportedFromIB2</string> <string>360.IBPluginDependency</string> <string>361.IBPluginDependency</string> <string>362.IBPluginDependency</string> <string>363.IBPluginDependency</string> <string>364.IBPluginDependency</string> - <string>365.IBEditorWindowLastContentRect</string> <string>365.IBPluginDependency</string> <string>368.IBPluginDependency</string> <string>369.IBPluginDependency</string> <string>370.IBPluginDependency</string> <string>371.IBPluginDependency</string> - <string>371.ImportedFromIB2</string> <string>372.IBPluginDependency</string> <string>374.IBPluginDependency</string> - <string>374.ImportedFromIB2</string> <string>375.IBPluginDependency</string> - <string>376.IBEditorWindowLastContentRect</string> <string>376.IBPluginDependency</string> - <string>376.ImportedFromIB2</string> <string>377.IBPluginDependency</string> - <string>377.ImportedFromIB2</string> <string>378.IBPluginDependency</string> - <string>378.ImportedFromIB2</string> <string>379.IBPluginDependency</string> - <string>379.ImportedFromIB2</string> <string>383.IBPluginDependency</string> - <string>383.ImportedFromIB2</string> <string>384.IBPluginDependency</string> <string>387.IBPluginDependency</string> <string>388.IBPluginDependency</string> - <string>389.IBEditorWindowLastContentRect</string> <string>389.IBPluginDependency</string> <string>390.IBPluginDependency</string> <string>391.IBPluginDependency</string> <string>393.IBPluginDependency</string> <string>394.IBPluginDependency</string> <string>395.IBPluginDependency</string> - <string>395.ImportedFromIB2</string> <string>396.IBPluginDependency</string> <string>398.IBPluginDependency</string> - <string>398.ImportedFromIB2</string> <string>399.IBPluginDependency</string> <string>401.IBPluginDependency</string> - <string>401.ImportedFromIB2</string> <string>402.IBPluginDependency</string> <string>406.IBPluginDependency</string> <string>407.IBPluginDependency</string> <string>410.IBPluginDependency</string> <string>414.IBPluginDependency</string> - <string>414.ImportedFromIB2</string> <string>415.IBPluginDependency</string> - <string>416.IBEditorWindowLastContentRect</string> <string>416.IBPluginDependency</string> - <string>416.ImportedFromIB2</string> <string>417.IBPluginDependency</string> - <string>417.ImportedFromIB2</string> <string>419.IBPluginDependency</string> - <string>419.ImportedFromIB2</string> <string>420.IBPluginDependency</string> - <string>420.ImportedFromIB2</string> <string>442.IBPluginDependency</string> - <string>442.ImportedFromIB2</string> <string>443.IBPluginDependency</string> <string>444.IBPluginDependency</string> - <string>444.ImportedFromIB2</string> <string>445.IBPluginDependency</string> <string>446.IBPluginDependency</string> - <string>446.ImportedFromIB2</string> <string>447.IBPluginDependency</string> <string>448.IBPluginDependency</string> <string>449.IBPluginDependency</string> <string>450.IBPluginDependency</string> <string>451.IBPluginDependency</string> <string>457.IBPluginDependency</string> - <string>457.ImportedFromIB2</string> <string>458.IBPluginDependency</string> <string>463.IBPluginDependency</string> - <string>463.ImportedFromIB2</string> <string>464.IBPluginDependency</string> <string>480.IBPluginDependency</string> <string>481.IBPluginDependency</string> <string>484.IBPluginDependency</string> - <string>484.ImportedFromIB2</string> <string>485.IBPluginDependency</string> - <string>485.ImportedFromIB2</string> <string>486.IBPluginDependency</string> - <string>486.ImportedFromIB2</string> <string>487.IBPluginDependency</string> <string>491.IBPluginDependency</string> <string>492.IBPluginDependency</string> @@ -3000,63 +2939,33 @@ <string>497.IBPluginDependency</string> <string>498.IBPluginDependency</string> <string>499.IBPluginDependency</string> - <string>5.IBEditorWindowLastContentRect</string> <string>5.IBPluginDependency</string> <string>5.IBWindowTemplateEditedContentRect</string> - <string>5.ImportedFromIB2</string> <string>6.IBPluginDependency</string> - <string>6.ImportedFromIB2</string> <string>61.IBPluginDependency</string> - <string>61.ImportedFromIB2</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{96, 562}, {460, 256}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <integer value="1"/> - <string>{{0, 636}, {500, 209}}</string> - <string>{{144, 376}, {496, 82}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{0, 726}, {500, 108}}</string> - <string>{{73, 765}, {492, 91}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{134, 507}, {495, 241}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{0, 650}, {500, 184}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{348, 548}, {79, 48}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3071,107 +2980,76 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{612, 486}, {77, 88}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{614, 495}, {77, 54}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{535, 648}, {255, 63}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{828, 530}, {88, 71}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{317, 613}, {218, 54}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3182,14 +3060,10 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{69, 656}, {500, 200}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{69, 656}, {500, 200}}</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -3204,7 +3078,7 @@ <reference key="dict.values" ref="0"/> </object> <nil key="sourceID"/> - <int key="maxID">501</int> + <int key="maxID">502</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3213,35 +3087,14 @@ <string key="className">HBPreferencesController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>browseSendToApp:</string> - <string>runModal:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - </object> + <string key="NS.key.0">browseSendToApp:</string> + <string key="NS.object.0">id</string> </object> <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>browseSendToApp:</string> - <string>runModal:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">browseSendToApp:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">runModal:</string> - <string key="candidateClassName">id</string> - </object> + <string key="NS.key.0">browseSendToApp:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">browseSendToApp:</string> + <string key="candidateClassName">id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index 6b9c7a558..3b5f2d4cf 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -87,9 +87,8 @@ static NSMutableArray *masterBitRateArray = nil; { audioMustMatch = 0; } - // Auto Passthru disabled until we have GUI widgets for it - shouldAdd = ( hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS ) && - ( ( hb_audio_encoders[i].encoder != HB_ACODEC_CA_HAAC ) || encca_haac_available() ); + // don't add HE-AAC encoder if it's unavailable + shouldAdd = ( hb_audio_encoders[i].encoder != HB_ACODEC_CA_HAAC ) || encca_haac_available(); muxMKV = ( hb_audio_encoders[i].muxers & HB_MUX_MKV ) ? YES : NO; muxMP4 = ( hb_audio_encoders[i].muxers & HB_MUX_MP4 ) ? YES : NO; if( shouldAdd && audioMustMatch ) diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m index 09cc27f37..fe4b6072e 100644 --- a/macosx/HBAudioController.m +++ b/macosx/HBAudioController.m @@ -303,14 +303,6 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; [dict setObject: @"AAC (CoreAudio)" forKey: @"AudioEncoder"]; } - // Auto Passthru not yet enabled - fallback to AC3 Passthru as it is - // compatible with all source codecs (via the AC3 encoder fallback) - if ([key isEqualToString: @"Auto Passthru"]) - { - [dict setObject: @"AC3 Passthru" forKey: @"AudioEncoder"]; - key = @"AC3 Passthru"; - } - // passthru fallbacks if ([key isEqualToString: @"AAC Passthru"]) { diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m index a381b09a8..1be9ccf76 100644 --- a/macosx/HBPreferencesController.m +++ b/macosx/HBPreferencesController.m @@ -64,6 +64,7 @@ @"0.25", @"x264CqSliderFractional", @"YES", @"AlertBuiltInPresetUpdate", @"MetaX", @"SendCompletedEncodeToApp", + @"NO", @"ShowAdvancedOptsForAutoPassthru", nil]]; } diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm index c0336581a..86f1b759b 100644 --- a/macosx/HBQueueController.mm +++ b/macosx/HBQueueController.mm @@ -904,13 +904,24 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; /* check to see how many audio track lines to allow for */ unsigned int ourMaximumNumberOfAudioTracks = [HBController maximumNumberOfAllowedAudioTracks]; int actualCountOfAudioTracks = 0; + BOOL autoPassthruPresent = NO; for (unsigned int i = 1; i <= ourMaximumNumberOfAudioTracks; i++) { - if (0 < [[queueItemToCheck objectForKey: [NSString stringWithFormat: @"Audio%dTrack", i]] intValue]) { + if (0 < [[queueItemToCheck objectForKey: [NSString stringWithFormat: @"Audio%dTrack", i]] intValue]) + { actualCountOfAudioTracks++; } + if (HB_ACODEC_AUTO_PASS == [[queueItemToCheck objectForKey: [NSString stringWithFormat: @"JobAudio%dEncoder", i]] intValue]) + { + autoPassthruPresent = YES; + } } itemHeightForDisplay += (actualCountOfAudioTracks * rowHeightNonTitle); + if (autoPassthruPresent == YES) + { + itemHeightForDisplay += rowHeightNonTitle * 2; + } + /* add in subtitle lines for each subtitle in the SubtitleList array */ itemHeightForDisplay += rowHeightNonTitle * [[queueItemToCheck objectForKey:@"SubtitleList"] count]; @@ -1064,9 +1075,11 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; NSString *detailString; NSNumber *drc; NSNumber *gain; + BOOL autoPassthruPresent = NO; for (unsigned int i = 1; i <= ourMaximumNumberOfAudioTracks; i++) { base = [NSString stringWithFormat: @"Audio%d", i]; - if (0 < [[item objectForKey: [base stringByAppendingString: @"Track"]] intValue]) { + if (0 < [[item objectForKey: [base stringByAppendingString: @"Track"]] intValue]) + { audioCodecSummary = [NSString stringWithFormat: @"%@", [item objectForKey: [base stringByAppendingString: @"Encoder"]]]; drc = [item objectForKey: [base stringByAppendingString: @"TrackDRCSlider"]]; gain = [item objectForKey: [base stringByAppendingString: @"TrackGainSlider"]]; @@ -1081,6 +1094,11 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; ] ; [audioDetails addObject: detailString]; + // check if we have an Auto Passthru output track + if ([[item objectForKey: [NSString stringWithFormat: @"Audio%dEncoder", i]] isEqualToString: @"Auto Passthru"]) + { + autoPassthruPresent = YES; + } } } @@ -1316,8 +1334,65 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; [finalString appendString: @"\n" withAttributes: detailAttr]; } } - - /* Eighth Line Subtitle Details */ + + /* Eigth Line Auto Passthru Details */ + // only print Auto Passthru settings if we have an Auro Passthru output track + if (autoPassthruPresent == YES) + { + NSString *autoPassthruFallback = @"", *autoPassthruCodecs = @""; + autoPassthruFallback = [autoPassthruFallback stringByAppendingString: [item objectForKey: @"AudioEncoderFallback"]]; + if (0 < [[item objectForKey: @"AudioAllowAACPass"] intValue]) + { + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"AAC"]; + } + if (0 < [[item objectForKey: @"AudioAllowAC3Pass"] intValue]) + { + if (0 < [autoPassthruCodecs length]) + { + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @", "]; + } + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"AC3"]; + } + if (0 < [[item objectForKey: @"AudioAllowDTSHDPass"] intValue]) + { + if (0 < [autoPassthruCodecs length]) + { + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @", "]; + } + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"DTS-HD"]; + } + if (0 < [[item objectForKey: @"AudioAllowDTSPass"] intValue]) + { + if (0 < [autoPassthruCodecs length]) + { + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @", "]; + } + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"DTS"]; + } + if (0 < [[item objectForKey: @"AudioAllowMP3Pass"] intValue]) + { + if (0 < [autoPassthruCodecs length]) + { + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @", "]; + } + autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString: @"MP3"]; + } + [finalString appendString: @"Auto Passthru Codecs: " withAttributes: detailBoldAttr]; + if (0 < [autoPassthruCodecs length]) + { + [finalString appendString: autoPassthruCodecs withAttributes: detailAttr]; + } + else + { + [finalString appendString: @"None" withAttributes: detailAttr]; + } + [finalString appendString: @"\n" withAttributes: detailAttr]; + [finalString appendString: @"Auto Passthru Fallback: " withAttributes: detailBoldAttr]; + [finalString appendString: autoPassthruFallback withAttributes: detailAttr]; + [finalString appendString: @"\n" withAttributes: detailAttr]; + } + + /* Ninth Line Subtitle Details */ int i = 0; NSEnumerator *enumerator = [[item objectForKey:@"SubtitleList"] objectEnumerator]; |