Download-Tools/ccextractor
1
0
Fork 0
mirror of https://github.com/CCExtractor/ccextractor.git synced 2024-12-24 11:53:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/n108_wforums'

Browse Source
This commit is contained in:
cfsmp3 2014-10-07 12:00:36 +02:00
commit 22c40675a6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/params.c
View File

@ -235,6 +235,9 @@ void set_output_format (const char *format)
ccx_options.transcript_settings.showEndTime = 1;
ccx_options.transcript_settings.showCC = 0;
ccx_options.transcript_settings.showMode = 1;
} else {
// Throw exception
fatal(EXIT_INCOMPATIBLE_PARAMETERS, "timedtranscript cannot be set after -UCLA is used!");
}
}
else if (strcmp (format,"report")==0)
@ -1266,9 +1269,8 @@ void parse_parameters (int argc, char *argv[])
}
if (strcmp (argv[i],"-xds")==0)
{
if (!ccx_options.transcript_settings.isFinal){
ccx_options.transcript_settings.xds = 1;
}
// XDS can be set regardless of -UCLA (isFinal) usage.
ccx_options.transcript_settings.xds = 1;
continue;
}
if (strcmp (argv[i],"-xdsdebug")==0)
@ -1506,6 +1508,9 @@ void parse_parameters (int argc, char *argv[])
ccx_options.transcript_settings.relativeTimestamp = format[4] - '0';
ccx_options.transcript_settings.xds = format[5] - '0';
ccx_options.transcript_settings.useColors = format[6] - '0';
} else {
// Throw exception
fatal(EXIT_INCOMPATIBLE_PARAMETERS, "customtxt cannot be set after -UCLA is used!");
}
i++;
}