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

7 files changed, 3 insertions, 31 deletions

diff --git a/libhb/common.h b/libhb/common.h
index e78f71bd8..b9376cd93 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -190,12 +190,6 @@ struct hb_job_s
     int             audios[8];
 	int             audio_mixdowns[8];
 
-	/* this "surround" property will be removed shortly,
-	as soon as the AMIXDOWN code has been integrated into the Mac GUI
-	it's still included here to avoid breaking the Mac GUI short-term
-	however, it won't be applied in deca52.c etc. any more */
-	int             surround;
-
     /* Audio settings:
          acodec:   output codec
          abitrate: output bitrate (kbps)
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 6041ae744..36cdac5e9 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1373,9 +1373,6 @@ static int FormatSettings[3][4] =
 		 
 		 }
 
-		/* uncheck the "export 5.1 as 6-channel AAC" checkbox if it is checked */
-//		[fAudLang1SurroundCheck setState: NSOffState];
-
 	}
     
 	[self CalculatePictureSizing: sender];
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index bc5e6856c..6205a2dcc 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -196,7 +196,6 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
                 fDefAdvancedx264FlagsView = NSButton; 
-                fDefAudioSurround = NSButton; 
                 fDefAutoNaming = NSButton; 
                 fDefChapterMarkers = NSButton; 
                 fDefCrf = NSButton; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 91b113aeb..5ec8a74df 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>1843</key>
 		<string>610 276 220 592 0 0 1440 878 </string>
 		<key>29</key>
-		<string>11 834 365 44 0 0 1440 878 </string>
+		<string>16 1134 365 44 0 0 1920 1178 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -19,8 +19,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
+		<integer>1438</integer>
 		<integer>1867</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8P2137</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index ef298fa5d..be60a3839 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 2b0c0c13c..2d298a515 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -12,7 +12,6 @@
 	IBOutlet NSButton * fDefDeinterlace;
 	IBOutlet NSButton * fDefPicSizeAutoSetipod;
 	IBOutlet NSButton * fDefPixelRatio;
-	IBOutlet NSButton * fDefAudioSurround;
 	IBOutlet NSButton * fDefPresetDrawerShow;
 	IBOutlet NSButton * fDefAutoNaming;
 	IBOutlet NSButton * fDefChapterMarkers;
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"];