MacGui: lots of stuff I forgot to to in revision 4627, plus a minor code cleanup.

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

1 files changed, 19 insertions, 13 deletions

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 2eb0eb3f2..31f63808d 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -5074,11 +5074,14 @@ the user is using "Custom" settings by determining the sender*/
         videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[fPictureController detelecineCustomString]]];
     }
     
-    
     if ([fPictureController useDecomb] == 1)
     {
         /* Decomb */
-        if ([fPictureController decomb] == 3)
+        if ([fPictureController decomb] == 4)
+        {
+            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Bob)"];
+        }
+        else if ([fPictureController decomb] == 3)
         {
             videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Fast)"];
         }
@@ -5094,34 +5097,37 @@ the user is using "Custom" settings by determining the sender*/
     else
     {
         /* Deinterlace */
-        if ([fPictureController deinterlace] > 0)
+        if ([fPictureController deinterlace] == 5)
         {
             fTitle->job->deinterlace  = 1;
+            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Bob)"];
         }
-        else
-        {
-            fTitle->job->deinterlace  = 0;
-        }
-        
-        if ([fPictureController deinterlace] == 2)
+        else if ([fPictureController deinterlace] == 4)
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"];
+            fTitle->job->deinterlace  = 1;
+            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"];
         }
         else if ([fPictureController deinterlace] == 3)
         {
+            fTitle->job->deinterlace  = 1;
             videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slow)"];
         }
-        else if ([fPictureController deinterlace] == 4)
+        else if ([fPictureController deinterlace] == 2)
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"];
+            fTitle->job->deinterlace  = 1;
+            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"];
         }
         else if ([fPictureController deinterlace] == 1)
         {
+            fTitle->job->deinterlace  = 1;
             videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[fPictureController deinterlaceCustomString]]];
         }
+        else
+        {
+            fTitle->job->deinterlace  = 0;
+        }
 	}
     
-    
     /* Denoise */
 	if ([fPictureController denoise] == 2)
 	{