Mac GUI Surround Sound first integration attempt.

- needs to be fleshed out by maurj

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@320 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 6dc4c02db3a358e7c211bc2311acf8099194a83c..6caf48a8de221b2b9e378c21bc8362de3f52fae9 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -103,6 +103,7 @@
     /* Audio box */
     IBOutlet NSTextField         * fAudLang1Field;
     IBOutlet NSPopUpButton       * fAudLang1PopUp;
+    IBOutlet NSButton       * fAudLang1Surround;
     IBOutlet NSTextField         * fAudLang2Field;
     IBOutlet NSPopUpButton       * fAudLang2PopUp;
     IBOutlet NSTextField         * fAudRateField;
@@ -136,6 +137,8 @@
 - (IBAction) FormatPopUpChanged: (id) sender;
 - (IBAction) CodecsPopUpChanged: (id) sender;
 - (IBAction) EncoderPopUpChanged: (id) sender;
+- (IBAction) LanguagePopUpChanged: (id) sender;
+
 - (IBAction) BrowseFile: (id) sender;
 - (void)     BrowseFileDone: (NSSavePanel *) sheet
     returnCode: (int) returnCode contextInfo: (void *) contextInfo;

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index cf45ec740d229d6242c07bb5e06cd6dfc5a90d1a..0857b5add04aab88a167156f81bb036d9c59a6bc 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -685,7 +685,7 @@ static int FormatSettings[3][4] =
                Lets Deprecate Baseline Level 1.3*/
                job->h264_level = 30;
                job->mux = HB_MUX_IPOD;
-        /* move sanity check for iPod Encoding here */
+                    /* move sanity check for iPod Encoding here */
                job->pixel_ratio = 0 ;
 
                }
@@ -1151,6 +1151,27 @@ static int FormatSettings[3][4] =
   
 }
 
+
+- (IBAction) LanguagePopUpChanged: (id) sender
+{
+     /* Original Call from langpopups which then called prepare job*/
+        /*Note: fAudLang2PopUp is still connected to original action */
+     /* [self CalculateBitrate: sender]; */
+     /* Set Audio tracks based on language selected (taken from prepare job)*/
+       hb_job_t * job = fTitle->job;
+    job->audios[0] = [fAudLang1PopUp indexOfSelectedItem] - 1;
+    job->audios[1] = [fAudLang2PopUp indexOfSelectedItem] - 1;
+    job->audios[2] = -1;       
+
+    /* We set the checkbox "fAudLang1Surround" here using: */
+    /* [fAudLang1Surround        setState: 0] Depending on variables */        
+       
+       
+       
+  
+}
+
+
 /* Get and Display Current Pic Settings in main window */
 - (IBAction) CalculatePictureSizing: (id) sender
 {

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index ec791480a76d001292e4df43590c3d27fd96c0f5..dece618133ab345de1638f9bb75b60241d060a2b 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -11,6 +11,7 @@
                 EnableQueue = id; 
                 EncoderPopUpChanged = id; 
                 FormatPopUpChanged = id; 
+                LanguagePopUpChanged = id; 
                 OpenForums = id; 
                 OpenHomepage = id; 
                 Pause = id; 
@@ -30,6 +31,7 @@
                 fAudBitratePopUp = NSPopUpButton; 
                 fAudLang1Field = NSTextField; 
                 fAudLang1PopUp = NSPopUpButton; 
+                fAudLang1Surround = NSButton; 
                 fAudLang2Field = NSTextField; 
                 fAudLang2PopUp = NSPopUpButton; 
                 fAudRateField = NSTextField; 

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index ab6e1c2f07889b00cbd7528c7ca5bb966b962fb4..0693ea14890eb8e8f24cfdc4c53294d3f333e803 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>74 141 555 411 0 0 1440 878 </string>
+       <string>9 63 555 411 0 0 1440 878 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>29</key>
@@ -17,7 +17,7 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>1438</integer>
+               <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8L127</string>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index ab993d0c3f6428f839de5c7235a286efacd48032..3461e07ddac20f0f3284c59bf02fd184118d5c9b 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ