Skip to content

Commit

Permalink
Fix incorrect command line option blocks in mythcommflag
Browse files Browse the repository at this point in the history
This removes the incorrect mutual exclusion between 'chanid' and the
various skiplist/cutlist input/output utility functions.

Fixes #10041
  • Loading branch information
wagnerrp committed Sep 15, 2011
1 parent 364458e commit 0043547
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions mythtv/programs/mythcommflag/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ void MythCommFlagCommandLineParser::LoadArguments(void)
->SetGroup("Input")
<< add("--video", "video", "",
"Rebuild the seek table for a video (non-recording) file.", "")
->SetGroup("Input")
->SetGroup("Input") );

CommandLineArg::AllowOneOf( QList<CommandLineArg*>()
<< add("--gencutlist", "gencutlist", false,
"Copy the commercial skip list to the cutlist.", "")
<< add("--clearcutlist", "clearcutlist", false,
Expand All @@ -41,8 +43,15 @@ void MythCommFlagCommandLineParser::LoadArguments(void)
"Display the current commercial skip list.", "")
<< add("--setcutlist", "setcutlist", "",
"Set a new cutlist in the form:\n"
"#-#[,#-#]... (ie, 1-100,1520-3012,4091-5094)", "") );

"#-#[,#-#]... (ie, 1-100,1520-3012,4091-5094)", "")
<< add("--skipdb", "skipdb", false, "",
"Intended for external 3rd party use.")
->SetGroup("Advanced")
->SetRequires("file")
<< add("--rebuild", "rebuild", false,
"Do not flag commercials, just rebuild the seektable.", "")
->SetGroup("Commflagging")
->SetBlocks("commmethod") );

add("--method", "commmethod", "",
"Commercial flagging method[s] to employ:\n"
Expand All @@ -52,20 +61,12 @@ void MythCommFlagCommandLineParser::LoadArguments(void)
add("--outputmethod", "outputmethod", "",
"Format of output written to outputfile, essentials, full.", "")
->SetGroup("Commflagging");
add("--skipdb", "skipdb", false, "",
"Intended for external 3rd party use.")
->SetGroup("Advanced")
->SetRequires("file");
add("--queue", "queue", false,
"Insert flagging job into the JobQueue, rather than "
"running flagging in the foreground.", "");
add("--noprogress", "noprogress", false,
"Don't print progress on stdout.", "")
->SetGroup("Logging");
add("--rebuild", "rebuild", false,
"Do not flag commercials, just rebuild the seektable.", "")
->SetGroup("Commflagging")
->SetBlocks("commmethod");
add("--force", "force", false,
"Force operation, even if program appears to be in use.", "")
->SetGroup("Advanced");
Expand Down

0 comments on commit 0043547

Please sign in to comment.