diff options
author | dynaflash <[email protected]> | 2009-06-13 19:50:12 +0000 |
---|---|---|
committer | dynaflash <[email protected]> | 2009-06-13 19:50:12 +0000 |
commit | 61ee3250a66a273d3bf7b7594b5b8656993bc33f (patch) | |
tree | 42e0d9d05d691c2fc094169d2030e1dc472be5a6 /macosx/HBQueueController.mm | |
parent | 4c719cadc9a4158de14434236701721afd505396 (diff) |
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
Diffstat (limited to 'macosx/HBQueueController.mm')
-rw-r--r-- | macosx/HBQueueController.mm | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm index 39fb40ce0..a3e61ce29 100644 --- a/macosx/HBQueueController.mm +++ b/macosx/HBQueueController.mm @@ -1187,6 +1187,7 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; } + /* Seventh Line Audio Details*/ [finalString appendString: @"Audio Track 1: " withAttributes:detailBoldAttr]; [finalString appendString: audioDetail1 withAttributes:detailAttr]; @@ -1202,6 +1203,39 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; [finalString appendString: @"Audio Track 4: " withAttributes:detailBoldAttr]; [finalString appendString: audioDetail4 withAttributes:detailAttr]; + [finalString appendString:@"\n" withAttributes:detailAttr]; + + /* Eighth Line Subtitle Details */ + + int i = 0; + NSEnumerator *enumerator = [[item objectForKey:@"SubtitleList"] objectEnumerator]; + id tempObject; + while (tempObject = [enumerator nextObject]) + { + /* since the subtitleSourceTrackNum 0 is "None" in our array of the subtitle popups, + * we want to ignore it for display as well as encoding. + */ + if ([[tempObject objectForKey:@"subtitleSourceTrackNum"] intValue] > 0) + { + /* remember that index 0 of Subtitles can contain "Foreign Audio Search*/ + [finalString appendString: @"Subtitle: " withAttributes:detailBoldAttr]; + [finalString appendString: [tempObject objectForKey:@"subtitleSourceTrackName"] withAttributes:detailAttr]; + if ([[tempObject objectForKey:@"subtitleTrackForced"] intValue] == 1) + { + [finalString appendString: @" - Forced Only" withAttributes:detailAttr]; + } + if ([[tempObject objectForKey:@"subtitleTrackBurned"] intValue] == 1) + { + [finalString appendString: @" - Burned In" withAttributes:detailAttr]; + } + if ([[tempObject objectForKey:@"subtitleTrackDefault"] intValue] == 1) + { + [finalString appendString: @" - Default" withAttributes:detailAttr]; + } + [finalString appendString:@"\n" withAttributes:detailAttr]; + } + i++; + } return finalString; } |