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/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libhb/reader.c') diff --git a/libhb/reader.c b/libhb/reader.c index c865ea85f..9ac515c4e 100644 --- a/libhb/reader.c +++ b/libhb/reader.c @@ -527,7 +527,7 @@ static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id ) subtitle = hb_list_item( title->list_subtitle, i ); if (id == subtitle->id) { subtitle->hits++; - if( !job->indepth_scan || subtitle->force ) + if( !job->indepth_scan || subtitle->config.force ) { /* * Pass the subtitles to be processed if we are not scanning, or if -- cgit v1.2.3