MacGui: Audio ... Allow more than 4 audio tracks.

- Patch courtesy of circleone ...  Thanks!
- Use a NSTableView to dynamically add/delete audio tracks ala the Subtitle tab.
- Sets a 24 track limit until someone tests more than 24 tracks (the libhb 8 track limit was removed as per http://trac.handbrake.fr/changeset/3531).
- Replaces the old static 4 tracks to a dynamic array.
- Moves macgui audio handling to a separate class.
Known caveats: 
- Borks queue editing which needs a revamp anyway.
- Queue window display needs to be adjusted to show more than 4 tracks appropriately. Again, its cosmetic and is not a show stopper.
- There may be other possible unknown side effects even though tested on all presets. That said, I feel it needs to get in so that we can get feedback from nightlies.

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

1 files changed, 11 insertions, 64 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index c94308e64..35a4b57d8 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -17,6 +17,12 @@
 #import "HBAdvancedController.h"
 #import "HBPreferencesController.h"
 #import "HBPresets.h"
+#import "HBAudioController.h"
+
+extern NSString *HBContainerChangedNotification;
+extern NSString *keyContainerTag;
+extern NSString *HBTitleChangedNotification;
+extern NSString *keyTitleTag;
 
 @class HBOutputPanelController;
 
@@ -154,61 +160,9 @@ BOOL                        fIsDragging;
 	HBSubtitles                  * fSubtitlesDelegate;
     IBOutlet NSButton            * fBrowseSrtFileButton;
     
-	
-    /* Audio box */
-    /* Track Labels */
-    IBOutlet NSTextField         * fAudSourceLabel;
-    IBOutlet NSTextField         * fAudCodecLabel;
-    IBOutlet NSTextField         * fAudMixdownLabel;
-    IBOutlet NSTextField         * fAudSamplerateLabel;
-    IBOutlet NSTextField         * fAudBitrateLabel;
-    IBOutlet NSTextField         * fAudDrcLabel;
-    
-    IBOutlet NSTextField         * fAudTrack1Label;
-    IBOutlet NSTextField         * fAudTrack2Label;
-    IBOutlet NSTextField         * fAudTrack3Label;
-    IBOutlet NSTextField         * fAudTrack4Label;
-    
-    /* Source Audio PopUps */
-    IBOutlet NSPopUpButton       * fAudLang1PopUp;
-    IBOutlet NSPopUpButton       * fAudLang2PopUp;
-    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 NSPopUpButton       * fAudTrack2MixPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack3MixPopUp;
-    IBOutlet NSPopUpButton       * fAudTrack4MixPopUp;
-	
-    /* 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            * fAudTrack1DrcSlider;
-    IBOutlet NSTextField         * fAudTrack1DrcField;
-    IBOutlet NSSlider            * fAudTrack2DrcSlider;
-    IBOutlet NSTextField         * fAudTrack2DrcField;
-    IBOutlet NSSlider            * fAudTrack3DrcSlider;
-    IBOutlet NSTextField         * fAudTrack3DrcField;
-    IBOutlet NSSlider            * fAudTrack4DrcSlider;
-    IBOutlet NSTextField         * fAudTrack4DrcField;
-    
+	/* New Audio box */
+	IBOutlet HBAudioController   * fAudioDelegate;
+	    
     /* Chapters box */
     IBOutlet NSButton            * fCreateChapterMarkers;
     IBOutlet NSTableView         * fChapterTable;
@@ -320,14 +274,6 @@ BOOL                        fIsDragging;
 - (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;
-- (IBAction) audioTrackPopUpChanged: (id) sender;
-- (IBAction) audioTrackPopUpChanged: (id) sender mixdownToUse: (int) mixdownToUse;
-- (IBAction) audioTrackMixdownChanged: (id) sender;
 - (void) prepareJob;
 - (IBAction) browseFile: (id) sender;
 - (void)     browseFileDone: (NSSavePanel *) sheet
@@ -338,7 +284,6 @@ BOOL                        fIsDragging;
 - (IBAction) qualitySliderChanged: (id) sender;
 - (void) setupQualitySlider;
 
-- (IBAction) audioDRCSliderChanged: (id) sender;
 - (IBAction) browseImportSrtFile: (id) sender;
 - (void) browseImportSrtFileDone: (NSSavePanel *) sheet
                      returnCode: (int) returnCode contextInfo: (void *) contextInfo;
@@ -470,5 +415,7 @@ BOOL                        fIsDragging;
 - (void)     browseForChapterFileSaveDone: (NSSavePanel *) sheet
                  returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 
++ (unsigned int) maximumNumberOfAllowedAudioTracks;
+
 @end