Removed all references to the old job->surround variable, as it is no longer used. Also, removed the "Extract 5.1 Dolby Digital to 6-Channel AAC" preference option from the Mac OS GUI prefs window and controller, as it is no longer needed. It may be worth adding in a new "Default mixdown" preference in its place for a future version of Handbrake?

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

1 files changed, 0 insertions, 18 deletions

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 9ce02435a..4c9121e57 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -24,8 +24,6 @@
                    forKey:@"DefaultPicSizeAutoiPod"];
 	appDefaults = [NSDictionary dictionaryWithObject:@"NO"
                    forKey:@"PixelRatio"];
-          appDefaults = [NSDictionary dictionaryWithObject:@"NO"
-                   forKey:@"DefaultSurroundSound"];
 	appDefaults = [NSDictionary dictionaryWithObject:@""
                    forKey:@"DefAdvancedx264Flags"];
 	appDefaults = [NSDictionary dictionaryWithObject:@"YES"
@@ -246,10 +244,6 @@
     [fDefPixelRatio setState: [defaults boolForKey:@"PixelRatio"] ?
 				  NSOnState : NSOffState];
 	
-	/* fDefAudioSurround Check or uncheck according to the preferences */
-    [fDefAudioSurround setState: [defaults boolForKey:@"DefaultSurroundSound"] ?
-					 NSOnState : NSOffState];
-		
 	/* Insert default DefAdvanced x264 Flag here */
 	if ([defaults stringForKey:@"DefAdvancedx264Flags"]!=NULL)
 	{
@@ -354,18 +348,6 @@
         [defaults setObject:@"NO" forKey:@"PixelRatio"];
     }
  
-  
-        /* Use Surround Sound if available*/
-	
-	if( [fDefAudioSurround state] == NSOnState )
-    {
-        [defaults setObject:@"YES" forKey:@"DefaultSurroundSound"];
-    }
-    else
-    {
-        [defaults setObject:@"NO" forKey:@"DefaultSurroundSound"];
-    }	
-    
 		
 	/*Advanced x264 Flag string into */
       [defaults setObject:[fDefAdvancedx264FlagsView string]  forKey:@"DefAdvancedx264Flags"];