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 -xds willem changes

Browse Source
This commit is contained in:
Anshul Maheshwari 2014-10-07 19:50:02 +05:30
commit c9c063b8d8
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/lib_ccx/params.c
View File

@ -234,6 +234,9 @@ void set_output_format (const char *format)
ccx_options.transcript_settings.showEndTime = 1; ccx_options.transcript_settings.showEndTime = 1;
ccx_options.transcript_settings.showCC = 0; ccx_options.transcript_settings.showCC = 0;
ccx_options.transcript_settings.showMode = 1; 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) else if (strcmp (format,"report")==0)
@ -1265,9 +1268,8 @@ void parse_parameters (int argc, char *argv[])
} }
if (strcmp (argv[i],"-xds")==0) if (strcmp (argv[i],"-xds")==0)
{ {
if (!ccx_options.transcript_settings.isFinal){ // XDS can be set regardless of -UCLA (isFinal) usage.
ccx_options.transcript_settings.xds = 1; ccx_options.transcript_settings.xds = 1;
}
continue; continue;
} }
if (strcmp (argv[i],"-xdsdebug")==0) if (strcmp (argv[i],"-xdsdebug")==0)
@ -1505,6 +1507,9 @@ void parse_parameters (int argc, char *argv[])
ccx_options.transcript_settings.relativeTimestamp = format[4] - '0'; ccx_options.transcript_settings.relativeTimestamp = format[4] - '0';
ccx_options.transcript_settings.xds = format[5] - '0'; ccx_options.transcript_settings.xds = format[5] - '0';
ccx_options.transcript_settings.useColors = format[6] - '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++; i++;
} }