MacGui: Remove vestigial conditional which did not allow loose anamorphic if the...

- Patch by Rodeo. Thanks Rodeo!
- Addresses http://forum.handbrake.fr/viewtopic.php?f=4&t=13117

git-svn-id: svn://localhost/HandBrake/trunk@2943 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 32b1395..7047e57 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -4451,18 +4451,9 @@ the user is using "Custom" settings by determining the sender*/
         [fAdvancedOptions setHidden:NO];
         [self autoSetM4vExtension: sender];
     }
-    
-    /* We need to set loose anamorphic as available depending on whether or not the ffmpeg encoder
-    is being used as it borks up loose anamorphic .
-    For convenience lets use the titleOfSelected index. Probably should revisit whether or not we want
-    to use the index itself but this is easier */
+
     if (videoEncoder == HB_VCODEC_FFMPEG)
     {
-        if (job->anamorphic.mode == 2)
-        {
-            job->anamorphic.mode = 0;
-        }
-        [fPictureController setAllowLooseAnamorphic:NO];
         /* We set the iPod atom checkbox to disabled and uncheck it as its only for x264 in the mp4
          container. Format is taken care of in formatPopUpChanged method by hiding and unchecking
          anything other than MP4.
@@ -4472,7 +4463,6 @@ the user is using "Custom" settings by determining the sender*/
     }
     else
     {
-        [fPictureController setAllowLooseAnamorphic:YES];
         [fDstMp4iPodFileCheck setEnabled: YES];
     }
     [self setupQualitySlider];

diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 7a3d96e..4a1dd61 100644 (file)
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -101,7 +101,6 @@
     int     MaxOutputWidth;
     int     MaxOutputHeight;
     BOOL    autoCrop;
-    BOOL    allowLooseAnamorphic;
     
     int output_width, output_height, output_par_width, output_par_height;
     int display_width;
@@ -184,9 +183,6 @@
 - (BOOL) autoCrop;
 - (void) setAutoCrop: (BOOL) setting;
 
-- (BOOL) allowLooseAnamorphic;
-- (void) setAllowLooseAnamorphic: (BOOL) setting;
-
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
 - (IBAction) storageLinkChanged: (id) sender;
 - (IBAction) parLinkChanged: (id) sender;

diff --git a/macosx/PictureController.m b/macosx/PictureController.m
index 307962a..67fe65f 100644 (file)
--- a/macosx/PictureController.m
+++ b/macosx/PictureController.m
@@ -520,10 +520,7 @@
     [fAnamorphicPopUp removeAllItems];
     [fAnamorphicPopUp addItemWithTitle: @"None"];
     [fAnamorphicPopUp addItemWithTitle: @"Strict"];
-    if (allowLooseAnamorphic)
-    {
     [fAnamorphicPopUp addItemWithTitle: @"Loose"];
-    }
     [fAnamorphicPopUp addItemWithTitle: @"Custom"];
     [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
     
@@ -1105,16 +1102,6 @@
     autoCrop = setting;
 }
 
-- (BOOL) allowLooseAnamorphic
-{
-    return allowLooseAnamorphic;
-}
-
-- (void) setAllowLooseAnamorphic: (BOOL) setting
-{
-    allowLooseAnamorphic = setting;
-}
-
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
 {
     //[self SetTitle:title];