MacGui: separate the video settings logic from the view controller. There are a number of small regression ("Custom" preset and auto naming not updating) that will be fixed in the next commits.

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

1 files changed, 4 insertions, 63 deletions

diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h
index e7267cfe0..526b71c13 100644
--- a/macosx/HBAdvancedController.h
+++ b/macosx/HBAdvancedController.h
@@ -7,73 +7,14 @@
 #import <Cocoa/Cocoa.h>
 #import "HBViewValidation.h"
 
+@class HBVideo;
+
 /**
  *  HBAdvancedController
  */
 @interface HBAdvancedController : NSViewController <HBViewValidation>
-{
-    /* Advanced Tab for opts fX264optView*/
-    IBOutlet NSBox              * fOptionsBox;
-
-    IBOutlet NSView             * fEmptyView;
-
-    IBOutlet NSView             * fX264optView;
-    IBOutlet NSTextField        * fX264optViewTitleLabel;
-    IBOutlet NSTextField        * fDisplayX264OptionsLabel;
-    IBOutlet NSTextField        * fDisplayX264Options;
-
-    IBOutlet NSTextField        * fX264optBframesLabel;
-    IBOutlet NSPopUpButton      * fX264optBframesPopUp;
-    IBOutlet NSTextField        * fX264optRefLabel;
-    IBOutlet NSPopUpButton      * fX264optRefPopUp;
-    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        * fX264optMotionEstLabel;
-    IBOutlet NSPopUpButton      * fX264optMotionEstPopUp;
-    IBOutlet NSTextField        * fX264optMERangeLabel;
-    IBOutlet NSPopUpButton      * fX264optMERangePopUp;
-    IBOutlet NSTextField        * fX264optBPyramidLabel;
-    IBOutlet NSPopUpButton      * fX264optBPyramidPopUp;
-    IBOutlet NSTextField        * fX264optDirectPredLabel;
-    IBOutlet NSPopUpButton      * fX264optDirectPredPopUp;
-    IBOutlet NSTextField        * fX264optDeblockLabel;
-    IBOutlet NSPopUpButton      * fX264optAlphaDeblockPopUp;
-    IBOutlet NSPopUpButton      * fX264optBetaDeblockPopUp;
-    IBOutlet NSTextField        * fX264optAnalyseLabel;
-    IBOutlet NSPopUpButton      * fX264optAnalysePopUp;
-    IBOutlet NSTextField        * fX264opt8x8dctLabel;
-    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
 
-- (NSString *) optionsString;
-- (void) setOptions: (NSString *)string;
-- (void) setHidden: (BOOL) hide;
-- (IBAction) X264AdvancedOptionsAnimate: (id) sender;
-- (IBAction) X264AdvancedOptionsSet: (id) sender;
-- (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;
+@property (nonatomic, readwrite, retain) HBVideo *videoSettings;
+@property (nonatomic, readwrite, getter=isHidden) BOOL hidden;
 
 @end