From b1fcb3154f5c09a81e0cf712fad9d22f4e8e89bc Mon Sep 17 00:00:00 2001 From: jstebbins Date: Tue, 2 Jun 2009 15:32:01 +0000 Subject: softsubtitles: - when doing an indepth scan, do not scan CC tracks - separate subtitle configureation attributes into separate hb_subtitle_config_t. Add an instance of this to hb_job_t for setting the attributes of the subtitle found through an indepth scan - Add a default_track flag to hb_subtitle_config_t that tells the muxer that the track should be flaged as the default. muxmkv uses this. - When an indepth scan is complete, check to see if the autoselected subtitle matchces (by id) one of the manually selected subtitles. If a match is found, the autoselected subtitle with all the attributes the user assigned to it replaces the manually selected subtitle. - LinGui: Add "Default" column to subtitle tab. This is a radio that lets the user choose which subtitle should be displayed by default. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2468 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/muxmkv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libhb/muxmkv.c') diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index ace68f454..2e8814ca9 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -287,7 +287,7 @@ static int MKVInit( hb_mux_object_t * m ) int len; subtitle = hb_list_item( title->list_subtitle, i ); - if (subtitle->dest != PASSTHRUSUB) + if (subtitle->config.dest != PASSTHRUSUB) continue; memset(track, 0, sizeof(mk_TrackConfig)); @@ -313,6 +313,10 @@ static int MKVInit( hb_mux_object_t * m ) default: continue; } + if ( subtitle->config.default_track ) + { + track->flagDefault = 1; + } mux_data = calloc(1, sizeof( hb_mux_data_t ) ); subtitle->mux_data = mux_data; -- cgit v1.2.3