MacGui: Implement per track audio settings.

- Expands the number of audio tracks the macgui can encode to 4.
- Everything except drc is now set on a per track basis
- Be Gone self limiting "Codecs" PopUp !
- Can now use any audio codecs that the container will support in the same encode
- The previous "AAC + AC3" bizarre hybrid is now deprecated and you simply set them up per track
- Implement full audio list readout in the queue, tracks are now show one per line in a list like fashion
- Queue is no longer hard coded for just two tracks.
- Preset code updated to regress to handle previous presets that utilized the codecs popup to determine audio scheme to use
- Preset code now handles everything except language selection.
- The Format, Video Encoder and Audio codes are all now stored in the appropriate NSPopUp tags for very easy retrieval.
- Crazy format, codecs struct is now gone as we get that from the tags.
- AC3 Passthru properly shows the input bitrate and 48 khz samplerate in the appropriate popups
- Added Theora video encoder to OGM container
- Added libtheora to the libhb dylib 
- NOTE: The check against trying to use AC3 Passthru on a DTS track is broken on the encoder popup.

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

1 files changed, 44 insertions, 16 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index c660166c2..a9ed52e80 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -74,8 +74,8 @@ BOOL                        fIsDragging;
     /* Destination box */
     IBOutlet NSTextField         * fDstFormatField;
 	IBOutlet NSPopUpButton       * fDstFormatPopUp;
-	IBOutlet NSTextField         * fDstCodecsField;
-    IBOutlet NSPopUpButton       * fDstCodecsPopUp;
+	//IBOutlet NSTextField         * fDstCodecsField;
+    //IBOutlet NSPopUpButton       * fDstCodecsPopUp;
     IBOutlet NSTextField         * fDstFile1Field;
     IBOutlet NSTextField         * fDstFile2Field;
     IBOutlet NSButton            * fDstBrowseButton;
@@ -140,22 +140,49 @@ BOOL                        fIsDragging;
 	IBOutlet NSButton            * fSubForcedCheck;
 	
     /* Audio box */
-    IBOutlet NSTextField         * fAudLang1Field;
+    /* Track Labels */
+    IBOutlet NSTextField         * fAudSourceLabel;
+    IBOutlet NSTextField         * fAudCodecLabel;
+    IBOutlet NSTextField         * fAudMixdownLabel;
+    IBOutlet NSTextField         * fAudSamplerateLabel;
+    IBOutlet NSTextField         * fAudBitrateLabel;
+    
+    IBOutlet NSTextField         * fAudTrack1Label;
+    IBOutlet NSTextField         * fAudTrack2Label;
+    IBOutlet NSTextField         * fAudTrack3Label;
+    IBOutlet NSTextField         * fAudTrack4Label;
+    
+    /* Source Audio PopUps */
     IBOutlet NSPopUpButton       * fAudLang1PopUp;
-    IBOutlet NSTextField         * fAudLang2Field;
     IBOutlet NSPopUpButton       * fAudLang2PopUp;
-	/* New Audio Mix PopUps */
-	/* Track info */
-    IBOutlet NSTextField         * fAudTrack1MixLabel;
+    IBOutlet NSPopUpButton       * fAudLang3PopUp;
+    IBOutlet NSPopUpButton       * fAudLang4PopUp;
+    
+    /* Codec Popups */
+    IBOutlet NSPopUpButton       * fAudTrack1CodecPopUp;
+    IBOutlet NSPopUpButton       * fAudTrack2CodecPopUp;
+    IBOutlet NSPopUpButton       * fAudTrack3CodecPopUp;
+    IBOutlet NSPopUpButton       * fAudTrack4CodecPopUp;
+    
+	/* Mixdown PopUps */
 	IBOutlet NSPopUpButton       * fAudTrack1MixPopUp;
-    IBOutlet NSTextField         * fAudTrack2MixLabel;
-	IBOutlet NSPopUpButton       * fAudTrack2MixPopUp;
+    IBOutlet NSPopUpButton       * fAudTrack2MixPopUp;
+    IBOutlet NSPopUpButton       * fAudTrack3MixPopUp;
+    IBOutlet NSPopUpButton       * fAudTrack4MixPopUp;
 	
-    /* Quality info */
-	IBOutlet NSTextField         * fAudRateField;
-    IBOutlet NSPopUpButton       * fAudRatePopUp;
-    IBOutlet NSTextField         * fAudBitrateField;
-    IBOutlet NSPopUpButton       * fAudBitratePopUp;
+    /* Samplerate PopUps */
+	IBOutlet NSPopUpButton       * fAudTrack1RatePopUp;
+    IBOutlet NSPopUpButton       * fAudTrack2RatePopUp;
+    IBOutlet NSPopUpButton       * fAudTrack3RatePopUp;
+    IBOutlet NSPopUpButton       * fAudTrack4RatePopUp;
+    
+    /* Bitrate PopUps */
+    IBOutlet NSPopUpButton       * fAudTrack1BitratePopUp;
+    IBOutlet NSPopUpButton       * fAudTrack2BitratePopUp;
+    IBOutlet NSPopUpButton       * fAudTrack3BitratePopUp;
+    IBOutlet NSPopUpButton       * fAudTrack4BitratePopUp;
+    
+    
     /*Dynamic Range Compression */
     IBOutlet NSSlider            * fAudDrcSlider;
     IBOutlet NSTextField         * fAudDrcField;
@@ -233,11 +260,12 @@ BOOL                        fIsDragging;
 - (IBAction) chapterPopUpChanged: (id) sender;
 
 - (IBAction) formatPopUpChanged: (id) sender;
-- (IBAction) codecsPopUpChanged: (id) sender;
-- (IBAction) encoderPopUpChanged: (id) sender;
+- (IBAction) videoEncoderPopUpChanged: (id) sender;
 - (IBAction) autoSetM4vExtension: (id) sender;
 - (IBAction) twoPassCheckboxChanged: (id) sender;
 - (IBAction) videoFrameRateChanged: (id) sender;
+- (IBAction) audioAddAudioTrackCodecs: (id)sender;
+- (IBAction) audioCodecsPopUpChanged: (id) sender;
 - (IBAction) setEnabledStateOfAudioMixdownControls: (id) sender;
 - (IBAction) addAllAudioTracksToPopUp: (id) sender;
 - (IBAction) selectAudioTrackInPopUp: (id) sender searchPrefixString: (NSString *) searchPrefixString selectIndexIfNotFound: (int) selectIndexIfNotFound;