MacGui: Add decomb setting to presets

- Even though currently in svn we allow for a custom setting, only observe Off and Default. So if a preset is created using "Custom" in the decomb NSPopUp the preset will actually use Default, so you will have to set it back to Custom manually.
- This is temporary as the "Custom" setting *should* be deprecated at some point.

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

1 files changed, 16 insertions, 2 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 2a912fef9..5ee6bc1fb 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -4409,7 +4409,8 @@ if (item == nil)
                     else
                     {
                         [fPictureController setDeblock:0];
-                    }             
+                    }
+                    
                     [self calculatePictureSizing: NULL];
                 }
                 
@@ -4476,6 +4477,17 @@ if (item == nil)
             else
             {
                 [fPictureController setDeblock:0];
+            }
+            /* Decomb */
+            /* Even though we currently allow for a custom setting for decomb, ultimately it will only have Off and
+             * Default so we just pay attention to anything greater than 0 as 1 (Default). 0 is Off. */
+            if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] > 0)
+            {
+                [fPictureController setDecomb:1];
+            }
+            else
+            {
+                [fPictureController setDecomb:0];
             }             
         }
         [self calculatePictureSizing: NULL];
@@ -4663,7 +4675,9 @@ if (item == nil)
 	[preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
     [preset setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
 	[preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
+    [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"]; 
+    [preset setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
+    
     
     /*Audio*/
     if ([fAudLang1PopUp indexOfSelectedItem] > 0)