MacGui: generalize video preset/tune/profile/level handling to make it works with the x265 encoder. Moved the lavc encoder options textfield to the video tab.

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

1 files changed, 4 insertions, 10 deletions

diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h
index d80923ddd..e7267cfe0 100644
--- a/macosx/HBAdvancedController.h
+++ b/macosx/HBAdvancedController.h
@@ -14,17 +14,14 @@
 {
     /* Advanced Tab for opts fX264optView*/
     IBOutlet NSBox              * fOptionsBox;
-    
+
+    IBOutlet NSView             * fEmptyView;
+
     IBOutlet NSView             * fX264optView;
-    IBOutlet NSView             * fFFmpegView;
     IBOutlet NSTextField        * fX264optViewTitleLabel;
     IBOutlet NSTextField        * fDisplayX264OptionsLabel;
     IBOutlet NSTextField        * fDisplayX264Options;
-    IBOutlet NSTextField        * fDisplayLavcOptionsLabel;
-    IBOutlet NSTextField        * fDisplayLavcOptions;
-    
-    IBOutlet NSTextField        * fDisplayTheoraOptionsLabel;
-    
+
     IBOutlet NSTextField        * fX264optBframesLabel;
     IBOutlet NSPopUpButton      * fX264optBframesPopUp;
     IBOutlet NSTextField        * fX264optRefLabel;
@@ -67,11 +64,8 @@
 // x264 Advanced Panel Methods
 
 - (NSString *) optionsString;
-- (NSString *) optionsStringLavc;
 - (void) setOptions: (NSString *)string;
-- (void) setLavcOptions: (NSString *)string;
 - (void) setHidden: (BOOL) hide;
-- (void) setLavcOptsEnabled: (BOOL) lavc;
 - (IBAction) X264AdvancedOptionsAnimate: (id) sender;
 - (IBAction) X264AdvancedOptionsSet: (id) sender;
 - (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender;