Fix potential crash in libbluray

[handbrake-jp/handbrake-jp-git.git] / macosx / HBAdvancedController.h

diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h
index 8b36382..bc6e5b8 100644 (file)
--- a/macosx/HBAdvancedController.h
+++ b/macosx/HBAdvancedController.h
@@ -20,24 +20,20 @@
     IBOutlet NSPopUpButton      * fX264optBframesPopUp;
     IBOutlet NSTextField        * fX264optRefLabel;
     IBOutlet NSPopUpButton      * fX264optRefPopUp;
-    IBOutlet NSTextField        * fX264optNfpskipLabel;
-    IBOutlet NSButton           * fX264optNfpskipSwitch;
+    IBOutlet NSButton           * fX264optWeightPSwitch;
+    IBOutlet NSTextField        * fX264optWeightPLabel;
     IBOutlet NSTextField        * fX264optNodctdcmtLabel;
     IBOutlet NSButton           * fX264optNodctdcmtSwitch;
     IBOutlet NSTextField        * fX264optSubmeLabel;
     IBOutlet NSPopUpButton      * fX264optSubmePopUp;
     IBOutlet NSTextField        * fX264optTrellisLabel;
     IBOutlet NSPopUpButton      * fX264optTrellisPopUp;
-    IBOutlet NSTextField        * fX264optMixedRefsLabel;
-    IBOutlet NSButton           * fX264optMixedRefsSwitch;
     IBOutlet NSTextField        * fX264optMotionEstLabel;
     IBOutlet NSPopUpButton      * fX264optMotionEstPopUp;
     IBOutlet NSTextField        * fX264optMERangeLabel;
     IBOutlet NSPopUpButton      * fX264optMERangePopUp;
-    IBOutlet NSTextField        * fX264optWeightBLabel;
-    IBOutlet NSButton           * fX264optWeightBSwitch;
     IBOutlet NSTextField        * fX264optBPyramidLabel;
-    IBOutlet NSButton           * fX264optBPyramidSwitch;
+    IBOutlet NSPopUpButton      * fX264optBPyramidPopUp;
     IBOutlet NSTextField        * fX264optDirectPredLabel;
     IBOutlet NSPopUpButton      * fX264optDirectPredPopUp;
     IBOutlet NSTextField        * fX264optDeblockLabel;
@@ -49,10 +45,14 @@
     IBOutlet NSButton           * fX264opt8x8dctSwitch;
     IBOutlet NSTextField        * fX264optCabacLabel;
     IBOutlet NSButton           * fX264optCabacSwitch;
+    IBOutlet NSSlider           * fX264optAqSlider;
+    IBOutlet NSTextField        * fX264optAqLabel;
     IBOutlet NSSlider           * fX264optPsyRDSlider;
     IBOutlet NSTextField        * fX264optPsyRDLabel;
     IBOutlet NSSlider           * fX264optPsyTrellisSlider;
     IBOutlet NSTextField        * fX264optPsyTrellisLabel;
+    IBOutlet NSPopUpButton      * fX264optBAdaptPopUp;
+    IBOutlet NSTextField        * fX264optBAdaptLabel;
 }
 
 // x264 Advanced Panel Methods
@@ -67,6 +67,9 @@
 - (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender;
 - (IBAction) X264AdvancedOptionsSetCurrentSettings: (id) sender;
 - (NSString *)  X264AdvancedOptionsStandardizeOptNames:(NSString *) cleanOptNameString;
+- (NSString *)  X264AdvancedOptionsOptIDToString: (id) sender;
+- (NSString *)  X264AdvancedOptionsWidgetToString: (NSString *) optName withID: (id) sender;
+- (BOOL) X264AdvancedOptionsIsOpt: (NSString *) optNameToChange inString: (NSString *) currentOptString;
 - (IBAction) X264AdvancedOptionsChanged: (id) sender;
 
 @end