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, 2 insertions, 31 deletions

diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m
index e0f509235..e005dc61d 100644
--- a/macosx/HBAdvancedController.m
+++ b/macosx/HBAdvancedController.m
@@ -30,27 +30,17 @@
     return [fDisplayX264Options stringValue];
 }
 
-- (NSString *) optionsStringLavc
-{
-    return [fDisplayLavcOptions stringValue];
-}
-
 - (void) setOptions: (NSString *)string
 {
     [fDisplayX264Options setStringValue:string];
     [self X264AdvancedOptionsSet:nil];
 }
 
-- (void) setLavcOptions: (NSString *)string
-{
-    [fDisplayLavcOptions setStringValue:string];
-}
-
 - (void) setHidden: (BOOL) hide
 {
-    if(hide)
+    if (hide)
     {
-        [fOptionsBox setContentView:fFFmpegView];
+        [fOptionsBox setContentView:fEmptyView];
     }
     else
     {
@@ -59,23 +49,6 @@
     return;
 }
 
-- (void) setLavcOptsEnabled: (BOOL) lavc
-{
-    if(lavc)
-    {
-        [fDisplayLavcOptions setHidden:NO];
-        [fDisplayLavcOptionsLabel setHidden:NO];
-        [fDisplayTheoraOptionsLabel setHidden:YES];
-    }
-    else
-    {
-        [fDisplayLavcOptions setHidden:YES];
-        [fDisplayLavcOptionsLabel setHidden:YES];
-        [fDisplayTheoraOptionsLabel setHidden:NO];
-    }
-    return;
-}
-
  - (void)setUIEnabled:(BOOL)flag
 {
     unsigned i;
@@ -105,8 +78,6 @@
         [controls[i] setEnabled: flag];
 
     }
-    
-    //[fX264optView setWantsLayer:YES];
 }
 
 - (void)dealloc