39 changes: 20 additions & 19 deletions mythtv/programs/mythfilldatabase/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
addVerbose();
addLogging();

add("--manual", "manual", "Run interactive configuration",
add("--manual", "manual", false, "Run interactive configuration",
"Manual mode will interactively ask you questions about "
"each channel as it is processed, to configure for "
"future use."
"mutually exclusive with --update");
add("--update", "update", "Run non-destructive updates",
add("--update", "update", false, "Run non-destructive updates",
"Run non-destructive updates on the database for "
"users in xmltv zones that do not provide channel "
"data. Stops the addition of new channels and the "
"changing of channel icons."
"mutually exclusive with --manual");
add("--preset", "preset", "Use channel preset values instead of numbers",
add("--preset", "preset", false, "Use channel preset values instead of numbers",
"For use with assigning preset numbers for each "
"channel. Useful for non-US countries where people "
"are used to assigning a sequenced number for each "
"channel:\n1->TVE1(S41), 2->La 2(SE18), 3->TV(21)...");
add("--file", "file", "Bypass grabbers and define sourceid and file",
add("--file", "file", false, "Bypass grabbers and define sourceid and file",
"Directly define the sourceid and XMLTV file to "
"import. Must be used in combination with:"
" --sourceid --xmlfile");
add("--dd-file", "file", "Bypass grabber, and read SD data from file",
add("--dd-file", "file", false, "Bypass grabber, and read SD data from file",
"Directly define the data needed to import a local "
"DataDirect download. Must be used in combination "
"with: \n"
Expand All @@ -46,31 +46,32 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
"Limit mythfilldatabase to only operate on the "
"specified channel source. This option is required "
"when using --file, --dd-file, or --xawchannels.");
add("--offset", "offset", 0, "Day offset of input xml file"
add("--offset", "offset", 0, "Day offset of input xml file",
"Specify how many days offset from today is the "
"information in the given XML file. This option is "
"required when using --dd-file.");
add("--lineupid", "lineupid", 0, "DataDirect lineup of input xml file"
add("--lineupid", "lineupid", 0, "DataDirect lineup of input xml file",
"Specify the DataDirect lineup that corresponds to "
"the information in the given XML file. This option "
"is required when using --dd-file.");
add("--xmlfile", "xmlfile", "", "XML file to import manually",
"Specify an XML guide data file to import directly "
"rather than pull data through the specified grabber.\n"
"This option is required when using --file or --dd-file.");
add("--xawchannels", "xawchannels", "Read channels from xawtvrc file",
add("--xawchannels", "xawchannels", false, "Read channels from xawtvrc file",
"Import channels from an xawtvrc file.\nThis option "
"requires --sourceid and --xawtvrcfile.");
add("--xawtvrcfile", "xawtvrcfile", "", "xawtvrc file to import channels from",
"Xawtvrc file containing channels to be imported.\n"
"This option is required when using --xawchannels.");
add("--do-channel-updates", "dochannelupdates", "update channels using datadirect",
add("--do-channel-updates", "dochannelupdates", false,
"update channels using datadirect",
"When using DataDirect, ask mythfilldatabase to "
"overwrite channel names, frequencies, etc. with "
"values available from the data source. This will "
"override custom channel names, which is why it "
"is disabled by default.");
add("--remove-new-channels", "removechannels",
add("--remove-new-channels", "removechannels", false,
"disable new channels on datadirect web interface",
"When using DataDirect, ask mythfilldatabase to "
"mark any new channels as disabled on the remote "
Expand All @@ -79,7 +80,7 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
"MythTV by running mythfilldatabase without this "
"option. New digital channels cannot be directly "
"imported and thus are disabled automatically.");
add("--do-not-filter-new-channels", "nofilterchannels",
add("--do-not-filter-new-channels", "nofilterchannels", false,
"don't filter ATSC channels for addition",
"Normally, MythTV tries to avoid adding ATSC "
"channels to NTSC channel lineups. This option "
Expand All @@ -96,27 +97,27 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
"Force the maximum number of days, counting today, "
"for the guide data grabber to check for future "
"listings.");
add("--refresh-today", "refreshtoday", "refresh today's listings",
add("--refresh-today", "refreshtoday", false, "refresh today's listings",
"This option is only valid for selected grabbers.\n"
"Force a refresh for today's guide data.\nThis can be used "
"in combination with other --refresh-<n> options.\n"
"If being used with datadirect, this option should not be "
"used, rather use --dd-grab-all to pull all listings each time.");
add("--dont-refresh-tomorrow", "dontrefreshtomorrow",
add("--dont-refresh-tomorrow", "dontrefreshtomorrow", false,
"don't refresh tomorrow's listings",
"This option is only valid for selected grabbers.\n"
"Prevent mythfilldatabase from pulling information for "
"tomorrow's listings. Data for tomorrow is always pulled "
"unless specifically specified otherwise.\n"
"If being used with datadirect, this option should not be "
"used, rather use --dd-grab-all to pull all listings each time.");
add("--refresh-second", "refreshsecond", "refresh listings two days from now",
add("--refresh-second", "refreshsecond", false, "refresh listings two days from now",
"This option is only valid for selected grabbers.\n"
"Force a refresh for guide data two days from now. This can "
"be used in combination with other --refresh-<n> options.\n"
"If being used with datadirect, this option should not be "
"used, rather use --dd-grab-all to pull all listings each time.");
add("--refresh-all", "refreshall", "refresh listings on all days",
add("--refresh-all", "refreshall", false, "refresh listings on all days",
"This option is only valid for selected grabbers.\n"
"This option forces a refresh of all guide data, but does so "
"with fourteen downloads of one day each.\n"
Expand All @@ -130,26 +131,26 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
"be used in combination with other --refresh-<n> options.\n"
"If being used with datadirect, this option should not be "
"used, rather use --dd-grab-all to pull all listings each time.");
add("--dont-refresh-tba", "dontrefreshtba",
add("--dont-refresh-tba", "dontrefreshtba", false,
"don't refresh \"To be announced\" programs",
"This option is only valid for selected grabbers.\n"
"Prevent mythfilldatabase from automatically refreshing any "
"programs marked as \"To be announced\".\n"
"If being used with datadirect, this option should not be "
"used, rather use --dd-grab-all to pull all listings each time.");
add("--dd-grab-all", "ddgraball", "refresh full data using DataDirect",
add("--dd-grab-all", "ddgraball", false, "refresh full data using DataDirect",
"This option is only valid for selected grabbers (DataDirect).\n"
"This option is the preferred way of updating guide data from "
"DataDirect, and pulls all fourteen days of guide data at once.");
add("--only-update-channels", "onlychannels", "only update channel lineup",
add("--only-update-channels", "onlychannels", false, "only update channel lineup",
"Download as little listings data as possible to update the "
"channel lineup.");
add("--no-mark-repeats", "markrepeats", true, "do not mark repeats", "");
add("--export-icon-map", "exporticonmap", "iconmap.xml",
"export icon map to file", "");
add("--import-icon-map", "importiconmap", "iconmap.xml",
"import icon map to file", "");
add("--update-icon-map", "updateiconmap", "updates icon map icons", "");
add("--update-icon-map", "updateiconmap", false, "updates icon map icons", "");
add("--reset-icon-map", "reseticonmap", "", "resets icon maps",
"Reset all icon maps. If given 'all' as an optional value, reset "
"channel icons as well.");
Expand Down
6 changes: 3 additions & 3 deletions mythtv/programs/mythfrontend/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ void MythFrontendCommandLineParser::LoadArguments(void)
addUPnP();
addLogging();

add(QStringList( QStringList() << "-r" << "--reset" ), "reset",
add(QStringList( QStringList() << "-r" << "--reset" ), "reset", false,
"Resets appearance, settings, and language.", "");
add(QStringList( QStringList() << "-p" << "--prompt" ), "prompt",
add(QStringList( QStringList() << "-p" << "--prompt" ), "prompt", false,
"Always prompt for backend selection.", "");
add(QStringList( QStringList() << "-d" << "--disable-autodiscovery" ),
"noautodiscovery", "Prevent frontend from using UPnP autodiscovery.", "");
"noautodiscovery", false, "Prevent frontend from using UPnP autodiscovery.", "");
}

QString MythFrontendCommandLineParser::GetHelpHeader(void) const
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythmessage/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void MythMessageCommandLineParser::LoadArguments(void)
add("--udpport", "port", 6948, "(optional) UDP Port to send to", "");
add("--bcastaddr", "addr", "127.0.0.1",
"(optional) IP address to send to", "");
add("--print-template", "printtemplate",
add("--print-template", "printtemplate", false,
"Print the template to be sent to the frontend", "");
}

12 changes: 6 additions & 6 deletions mythtv/programs/mythshutdown/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ void MythShutdownCommandLineParser::LoadArguments(void)
add(QStringList( QStringList() << "-w" << "--setwakeup" ), "setwakeup", "",
"Set the wakeup time (yyyy-MM-ddThh:mm:ss)", "");
add(QStringList( QStringList() << "-t" << "--setscheduledwakeup" ), "setschedwakeup",
"Set wakeup time to the next scheduled recording", "");
add(QStringList( QStringList() << "-q" << "--shutdown" ), "shutdown",
false, "Set wakeup time to the next scheduled recording", "");
add(QStringList( QStringList() << "-q" << "--shutdown" ), "shutdown", false,
"Apply wakeup time to nvram and shutdown.", "");
add(QStringList( QStringList() << "-x" << "--safeshutdown" ), "safeshutdown",
"Check if shutdown is possible, and shutdown", "");
add(QStringList( QStringList() << "-p" << "--startup" ), "startup",
false, "Check if shutdown is possible, and shutdown", "");
add(QStringList( QStringList() << "-p" << "--startup" ), "startup", false,
"Check startup status",
"Check startup status\n"
" returns 0 - automatic startup\n"
Expand All @@ -37,9 +37,9 @@ void MythShutdownCommandLineParser::LoadArguments(void)
" 1 - do check recording status\n\n"
" returns 0 - ok to shut down\n"
" 1 - not ok, idle check reset");
add(QStringList( QStringList() << "-l" << "--lock" ), "lock",
add(QStringList( QStringList() << "-l" << "--lock" ), "lock", false,
"disable shutdown", "");
add(QStringList( QStringList() << "-u" << "--unlock" ), "unlock",
add(QStringList( QStringList() << "-u" << "--unlock" ), "unlock", false,
"enable shutdown", "");
add(QStringList( QStringList() << "-s" << "--status" ), "status", 1,
"check current status",
Expand Down
18 changes: 9 additions & 9 deletions mythtv/programs/mythtranscode/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@ void MythTranscodeCommandLineParser::LoadArguments(void)
"Specifies whether transcode should honor the cutlist and "
"remove the marked off commercials. Optionally takes a "
"a cutlist as an argument when used with --infile.");
add("--inversecut", "inversecut",
add("--inversecut", "inversecut", false,
"Inverses the cutlist, leaving only the marked off sections.", "");
add(QStringList( QStringList() << "--allkeys" << "-k" ), "allkeys",
add(QStringList( QStringList() << "--allkeys" << "-k" ), "allkeys", false,
"Specifies the outputfile should be entirely keyframes.", "");
add(QStringList( QStringList() << "-f" << "--fifodir" ), "fifodir", "",
"Directory in which to write fifos to.", "");
add("--fifosync", "fifosync", "Enforce fifo sync.", "");
add("--passthrough", "passthru", "Pass through raw, unprocessed audio.", "");
add(QStringList( QStringList() << "-b" << "--buildindex" ), "reindex",
add("--fifosync", "fifosync", false, "Enforce fifo sync.", "");
add("--passthrough", "passthru", false, "Pass through raw, unprocessed audio.", "");
add(QStringList( QStringList() << "-b" << "--buildindex" ), "reindex", false,
"Build new keyframe index.", "");
add("--video", "video",
add("--video", "video", false,
"Specifies video is not a recording, must use --infile.", "");
add("--showprogress", "showprogress", "Display status info in stdout", "");
add("--showprogress", "showprogress", false, "Display status info in stdout", "");
add(QStringList( QStringList() << "-ro" << "--recorderOptions" ), "recopt",
"", "Comma separated list of recordingprofile overrides.", "");
add("--audiotrack", "audiotrack", 0, "Select specific audio track.", "");
add(QStringList( QStringList() << "-m" << "--mpeg2" ), "mpeg2",
add(QStringList( QStringList() << "-m" << "--mpeg2" ), "mpeg2", false,
"Specifies that a lossless transcode should be used.", "");
add(QStringList( QStringList() << "-e" << "--ostream" ), "ostream", ""
add(QStringList( QStringList() << "-e" << "--ostream" ), "ostream", "",
"Output stream type: dvd, ps", "");
add("--queue", "queue", "",
"Add a new transcoding job of the specified recording and "
Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythtv-setup/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ void MythTVSetupCommandLineParser::LoadArguments(void)
addDisplay();
addLogging();

add("--expert", "expert", "", "Expert mode.");
add("--scan-list", "scanlist", "", "no help");
add("--scan-save-only", "savescan", "", "no help");
add("--scan-non-interactive", "scannoninteractive", "", "nohelp");
add("--expert", "expert", false, "", "Expert mode.");
add("--scan-list", "scanlist", false, "", "no help");
add("--scan-save-only", "savescan", false, "", "no help");
add("--scan-non-interactive", "scannoninteractive", false, "", "no help");

add("--scan", "scan", 0U, "",
"Run the command line channel scanner on a specified card "
Expand All @@ -49,7 +49,7 @@ void MythTVSetupCommandLineParser::LoadArguments(void)
"to enumerate scans available for import.\n"
"This option is mutually exclusive with --scan, and can "
"be used with the options --FTAonly and --service-type.");
add("--FTAonly", "ftaonly", "", "Only import 'Free To Air' channels.");
add("--FTAonly", "ftaonly", false, "", "Only import 'Free To Air' channels.");
add("--service-type", "servicetype", "all", "",
"To be used with channel scanning or importing, specify "
"the type of services to import. Select from the following, "
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythwelcome/commandlineparser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void MythWelcomeCommandLineParser::LoadArguments(void)
addVerbose();
addLogging();

add(QStringList( QStringList() << "-s" << "--setup" ), "setup",
add(QStringList( QStringList() << "-s" << "--setup" ), "setup", false,
"Run setup for mythshutdown.", "");
}