diff options
| -rw-r--r-- | macosx/Controller.h | 2 | ||||
| -rw-r--r-- | macosx/Controller.mm | 29 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/classes.nib | 4 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/info.nib | 2 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/keyedobjects.nib | bin | 115671 -> 117537 bytes |
5 files changed, 34 insertions, 3 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h index d8f208abe..44a1d36f1 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -152,6 +152,8 @@ IBOutlet NSPopUpButton * fX264optSubmePopUp; IBOutlet NSTextField * fX264optTrellisLabel; IBOutlet NSPopUpButton * fX264optTrellisPopUp; + IBOutlet NSTextField * fX264optMixedRefsLabel; + IBOutlet NSPopUpButton * fX264optMixedRefsPopUp; /* User Preset variables here fPresetNewPicSettingsApply*/ diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 1238d468a..6db8e2562 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -648,7 +648,7 @@ return registrationDictionary; fCreateChapterMarkers,fX264optViewTitleLabel,fDisplayX264Options,fDisplayX264OptionsLabel,fX264optBframesLabel, fX264optBframesPopUp,fX264optRefLabel,fX264optRefPopUp,fX264optNfpskipLabel,fX264optNfpskipPopUp, fX264optNodctdcmtLabel,fX264optNodctdcmtPopUp,fX264optSubmeLabel,fX264optSubmePopUp, - fX264optTrellisLabel,fX264optTrellisPopUp}; + fX264optTrellisLabel,fX264optTrellisPopUp,fX264optMixedRefsLabel,fX264optMixedRefsPopUp}; for( unsigned i = 0; i < sizeof( controls ) / sizeof( NSControl * ); i++ ) @@ -1948,6 +1948,22 @@ the user is using "Custom" settings by determining the sender*/ { [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]]; } + + /*Mixed-references fX264optMixedRefsPopUp BOOLEAN*/ + [fX264optMixedRefsPopUp removeAllItems]; + [fX264optMixedRefsPopUp addItemWithTitle:@"Default (No)"]; + for (i=0; i<2;i++) + { + if (i==0) + { + [fX264optMixedRefsPopUp addItemWithTitle:[NSString stringWithFormat:@"No"]]; + } + else + { + [fX264optMixedRefsPopUp addItemWithTitle:[NSString stringWithFormat:@"Yes"]]; + } + } + /* Standardize the option string */ [self X264AdvancedOptionsStandardizeOptString: NULL]; /* Set Current GUI Settings based on newly standardized string */ @@ -2104,6 +2120,12 @@ the user is using "Custom" settings by determining the sender*/ { [fX264optTrellisPopUp selectItemAtIndex:[optValue intValue]+1]; } + /*Mixed Refs NSPopUpButton*/ + if ([optName isEqualToString:@"mixed-refs"]) + { + [fX264optMixedRefsPopUp selectItemAtIndex:[optValue intValue]+1]; + } + } } @@ -2139,6 +2161,11 @@ the user is using "Custom" settings by determining the sender*/ { optNameToChange = @"trellis"; } + if (sender == fX264optMixedRefsPopUp) + { + optNameToChange = @"mixed-refs"; + } + /* Set widgets depending on the opt string in field */ NSString * thisOpt; // The separated option such as "bframes=3" NSString * optName = @""; // The option name such as "bframes" diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib index 18a98773e..91c476f6e 100644 --- a/macosx/English.lproj/MainMenu.nib/classes.nib +++ b/macosx/English.lproj/MainMenu.nib/classes.nib @@ -40,7 +40,7 @@ CLASS = HBController; LANGUAGE = ObjC; OUTLETS = { - fAddPresetPanel = NSPanel; + fAddPresetPanel = NSPopUpButton; fAddToQuButton = NSButton; fAudBitrateField = NSTextField; fAudBitratePopUp = NSPopUpButton; @@ -138,6 +138,8 @@ fWindow = NSWindow; fX264optBframesLabel = NSTextField; fX264optBframesPopUp = NSPopUpButton; + fX264optMixedRefsLabel = NSTextField; + fX264optMixedRefsPopUp = NSPopUpButton; fX264optNfpskipLabel = NSTextField; fX264optNfpskipPopUp = NSPopUpButton; fX264optNodctdcmtLabel = NSTextField; diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index 16c7cb417..26a3334ab 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -23,7 +23,7 @@ <integer>1867</integer> </array> <key>IBSystem Version</key> - <string>8P2137</string> + <string>8L127</string> <key>IBUserGuides</key> <dict> <key>21</key> diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib Binary files differindex bc32495df..de5ea315e 100644 --- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib +++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib |