Revert x264 back to rev x264-r1195-5d75a9b.tar.gz until MB Tree works with weighted...

[handbrake-jp/handbrake-jp-git.git] / macosx / PictureController.mm

diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 7395154..38e312e 100644 (file)
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -487,13 +487,12 @@
     hb_job_t * job = title->job;
 
     fTitle = title;
-    
-     modulus = 8; //modulus value of 16, 8 or 4
+
     [fWidthStepper  setValueWraps: NO];
-    [fWidthStepper  setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
+    [fWidthStepper  setIncrement: 16];
     [fWidthStepper  setMinValue: 64];
     [fHeightStepper setValueWraps: NO];
-    [fHeightStepper setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
+    [fHeightStepper setIncrement: 16];
     [fHeightStepper setMinValue: 64];
     
     [fCropTopStepper    setIncrement: 2];
@@ -652,9 +651,9 @@
 - (IBAction) SettingsChanged: (id) sender
 {
     hb_job_t * job = fTitle->job;
-    
-    [fWidthStepper  setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
-    [fHeightStepper setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
+    [fModulusPopUp setEnabled:NO];
+    job->anamorphic.modulus = 16;
+
     /* Since custom anamorphic allows for a height setting > fTitle->height
      * check to make sure it is returned to fTitle->height for all other modes
      */
@@ -677,11 +676,6 @@
         job->crop[2] = [fCropLeftStepper   intValue];
         job->crop[3] = [fCropRightStepper  intValue];
     }
-    /* Initially we set modulus widgets to 16 and disabled since we
-     * only use it for Custom Anamorphic below
-     */
-    [fModulusPopUp setEnabled:NO];
-    job->anamorphic.modulus = 16;
     
     [fRatioCheck setEnabled: YES];
 
@@ -692,10 +686,18 @@
     
     /* If we are not custom anamorphic, make sure we retain the orginal par */
     if( [fAnamorphicPopUp indexOfSelectedItem] != 3 )
-       {
+    {
         job->anamorphic.par_width = titleParWidth;
         job->anamorphic.par_height = titleParHeight;
         [fRatioLabel setHidden: NO];
+        
+        [fWidthStepper  setIncrement: 16];
+        [fHeightStepper setIncrement: 16];
+    }
+    else
+    {
+        [fWidthStepper  setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
+        [fHeightStepper setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
     }
     
        if( [fAnamorphicPopUp indexOfSelectedItem] > 0 )
@@ -717,6 +719,7 @@
             [fWidthField setEnabled: NO];
             [fHeightStepper setEnabled: NO];
             [fHeightField setEnabled: NO];
+            [fRatioCheck setEnabled: NO];
         }
         else if ([fAnamorphicPopUp indexOfSelectedItem] == 2) // Loose anamorphic
         {
@@ -784,18 +787,14 @@
             [fDisplayWidthField setEnabled: YES];
             
             
-            /* If we are coming into custom ana or if in custom ana and the 
-             * keep ar checkbox is checked, we reset the par to original
-             * which gives us a way back if things are hosed up
+            /* If we are coming into custom anamorphic we reset the par to original
+             * which gives us a way back if things get hosed up.
              */
              
-            if (sender == fAnamorphicPopUp || (sender == fRatioCheck && [fRatioCheck  state] == NSOnState))
+            if (sender == fAnamorphicPopUp)
             {
-                if (sender == fAnamorphicPopUp)
-                {
-                    [fRatioCheck  setState: NSOnState];
-                }
-                
+                /* When entering custom anamorphic, we start with keep ar on */
+                [fRatioCheck  setState: NSOnState];
                 /*
                  KEEPING ASPECT RATIO
                  Disable editing: PIXEL WIDTH, PIXEL HEIGHT