MacGui: Multiple subtitle tracks initial implementation

- Subtitles now get their own tab
- "None" track is an empty track, add a new subtitle track by switching it to a valid source track.
- First track allows for "Foreign Language Search" which replaces the old "Auto Select".
- Remove a previously selected track by setting it back to "None"
- Sanity Checks:
-- Allow only one Burned In track.
-- Text tracks do not allow burned in to be set.
-- MP4 specific:
--- Allow only one VobSub and force burned in to be set.
---- Trying to set more than one vobsub in mp4 results in a warning, and the first vobsub track is retained.
- Presets: Currently subtitles are not recorded into presets (which they never have been).
- Live Preview:
-- Foreign Language Search is borked for live preview, so is ignored
-- Burned in subtitles work for both mp4 and mkv
-- Text subtitles work for mp4 if set to default (preview has no way to turn soft subs on/off)
-- Text subtitles do not show up in preview window even if checked as default.

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

1 files changed, 13 insertions, 2 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 87e7cd6a7..798e44393 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -10,6 +10,7 @@
 #include "hb.h"
 
 #import "ChapterTitles.h"
+#import "HBSubtitles.h"
 #import "PictureController.h"
 #import "HBPreviewController.h"
 #import "HBQueueController.h"
@@ -70,7 +71,8 @@ BOOL                        fIsDragging;
     IBOutlet NSTextField         * fSrcTitleField;
     IBOutlet NSPopUpButton       * fSrcTitlePopUp;
     
-    /* Angle selection popup (only used for libdvdnav */
+    
+    /* lib dvd nav specific */
     IBOutlet NSTextField         * fSrcAngleLabel;
     IBOutlet NSPopUpButton       * fSrcAnglePopUp;
     
@@ -132,6 +134,12 @@ BOOL                        fIsDragging;
     IBOutlet NSTextField         * fSubField;
     IBOutlet NSPopUpButton       * fSubPopUp;
 	IBOutlet NSButton            * fSubForcedCheck;
+    
+    
+    IBOutlet NSTableView         * fSubtitlesTable;
+	HBSubtitles                  * fSubtitlesDelegate;
+    //NSMutableArray               * subtitleArray;
+    
 	
     /* Audio box */
     /* Track Labels */
@@ -287,7 +295,6 @@ BOOL                        fIsDragging;
 - (IBAction) audioTrackPopUpChanged: (id) sender;
 - (IBAction) audioTrackPopUpChanged: (id) sender mixdownToUse: (int) mixdownToUse;
 - (IBAction) audioTrackMixdownChanged: (id) sender;
-- (IBAction) subtitleSelectionChanged: (id) sender;
 - (void) prepareJob;
 - (IBAction) browseFile: (id) sender;
 - (void)     browseFileDone: (NSSavePanel *) sheet
@@ -411,5 +418,9 @@ BOOL                        fIsDragging;
 - (void)moveObjectsInPresetsArray:(NSMutableArray *)array fromIndexes:(NSIndexSet *)indexSet toIndex:(NSUInteger)insertIndex;
 
 - (int) hbInstances;
+
+
+
+
 @end