MacGui: Advanced x264 panel overhaul. - Updates labeling

- Updates tooltips
- Rearranges layout to group options by encoding features, analysis options, and psychovisual options
- Adds weightp checkbox
- Adds adaptive quantization slider going from 0 - 2.0
- Removes mixed-refs switch
- Removes weightb switch
- Removes no-fast-pskip switch
- Removes spurious 0 value for reference frames, clamps values to 1-16
- Converts b-pyramid from a checkbox to a menu to allow strict, makes normal instead of off the default
- Defaults b-pyramid to being on, removes it from string when it's on, and converts text values of strict or normal to a checked box since we're not offering strict.
- Makes psy-rd slider go to 2.0
- Changes analyse some (default) to most, add new some (i4x4,i8x8)
- Makes psy-trellis go in 0.05 increments instead of 0.1 increments.
- Stops hiding 8x8dct when analyse is none (thanks, Rodeo)
- Fixes animated reset of psy-rd and psy-trellis sliders when hidden (thanks, Rodeo)
- Hides psy-trellis when cabac goes off (thanks, Rodeo)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3392 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 7 deletions

diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h
index a58b2f886..bc6e5b808 100644
--- 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,6 +45,8 @@
     IBOutlet NSButton           * fX264opt8x8dctSwitch;
     IBOutlet NSTextField        * fX264optCabacLabel;
     IBOutlet NSButton           * fX264optCabacSwitch;
+    IBOutlet NSSlider           * fX264optAqSlider;
+    IBOutlet NSTextField        * fX264optAqLabel;
     IBOutlet NSSlider           * fX264optPsyRDSlider;
     IBOutlet NSTextField        * fX264optPsyRDLabel;
     IBOutlet NSSlider           * fX264optPsyTrellisSlider;