MacGui: Remove the VFR checkbox in the Picture Settings window.

- Use vfr if the framerate popup is "Same as source" and Detelecine is checked in Picture Settings.
- Otherwise framerate works as in the past.

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

1 files changed, 2 insertions, 22 deletions

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 34d034d63..743bda368 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -113,8 +113,7 @@
 	}
 	
 	/* Set filters widgets according to the filters struct */
-	[fVFRCheck setState:fPictureFilterSettings.vfr];
-    [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
+	[fDetelecineCheck setState:fPictureFilterSettings.detelecine];
     [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
     [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
     [fDeblockCheck setState: fPictureFilterSettings.deblock];
@@ -335,16 +334,7 @@ are maintained across different sources */
         job->deinterlace  = 0;
     }
     fPictureFilterSettings.denoise     = [fDenoisePopUp indexOfSelectedItem];
-    fPictureFilterSettings.vfr  = [fVFRCheck state];
-    if (fPictureFilterSettings.vfr > 0)
-    {
-        [fDetelecineCheck setState:NSOnState];
-        [fDetelecineCheck setEnabled: NO];
-    }
-    else
-    {
-        [fDetelecineCheck setEnabled: YES];
-    }
+    
     fPictureFilterSettings.detelecine  = [fDetelecineCheck state];
     
     if ([fDeblockField stringValue] == @"Off")
@@ -474,16 +464,6 @@ are maintained across different sources */
     fPictureFilterSettings.detelecine = setting;
 }
 
-- (int) vfr
-{
-    return fPictureFilterSettings.vfr;
-}
-
-- (void) setVFR: (int) setting
-{
-    fPictureFilterSettings.vfr = setting;
-}
-
 - (int) deinterlace
 {
     return fPictureFilterSettings.deinterlace;