189 changes: 32 additions & 157 deletions mythtv/libs/libmythbase/exitcodes.h
View file
Original file line number Diff line number Diff line change
@@ -1,162 +1,37 @@
#ifndef __MYTH_EXIT_CODES__
#define __MYTH_EXIT_CODES__

// ALL statuses that are not to be mapped directly to an exit code *must*
// be > 256 for sanity's sakes. The functionality of
// mythwelcome/welcomedialog.cpp depends on being able to use exit code as an
// 8-bit masked integer.

#define GENERIC_EXIT_OK 0
#define GENERIC_EXIT_NOT_OK 256
#define GENERIC_EXIT_CMD_NOT_FOUND 257
#define GENERIC_EXIT_EXECL_ERROR 258
#define GENERIC_EXIT_NO_MYTHCONTEXT 259
#define GENERIC_EXIT_NO_THEME 260
#define GENERIC_EXIT_INVALID_CMDLINE 261
#define GENERIC_EXIT_DB_OUTOFDATE 262
#define GENERIC_EXIT_DB_ERROR 263
#define GENERIC_EXIT_SOCKET_ERROR 264
#define GENERIC_EXIT_OPENING_LOGFILE_ERROR 265
#define GENERIC_EXIT_UNKNOWN_ERROR 266
#define FIXME_BUG__LIBRARY_EXIT_NO_THEME 267
#define FIXME_BUG__LIBRARY_EXIT_TFW_FAILED_OPEN 268
#define GENERIC_EXIT_INVALID_TIMEZONE 269
#define GENERIC_EXIT_SIGNALLED 270
#define GENERIC_EXIT_TIMEOUT 271
#define GENERIC_EXIT_ABORTED 272
#define GENERIC_EXIT_RUNNING 273
#define GENERIC_EXIT_PIPE_FAILURE 274
#define GENERIC_EXIT_TERMINATED 275
#define GENERIC_EXIT_NO_HANDLER 276
#define GENERIC_EXIT_START 276

// libmyth
#define MYTHSYSTEM__EXIT__EXECL_ERROR GENERIC_EXIT_EXECL_ERROR
#define MYTHSYSTEM__EXIT__CMD_NOT_FOUND GENERIC_EXIT_CMD_NOT_FOUND
#define MYTHSYSTEM__EXIT__PIPE_FAILURE GENERIC_EXIT_PIPE_FAILURE

// libmythtv
#define CHANNEL__EXIT__EXECL_ERROR GENERIC_EXIT_EXECL_ERROR

// mythfrontend
#define FRONTEND_EXIT_OK GENERIC_EXIT_OK
#define FRONTEND_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define FRONTEND_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define FRONTEND_EXIT_NO_THEME GENERIC_EXIT_NO_THEME
#define FRONTEND_EXIT_OPENING_LOGFILE_ERROR GENERIC_EXIT_OPENING_LOGFILE_ERROR
#define FRONTEND_EXIT_DB_OUTOFDATE GENERIC_EXIT_DB_OUTOFDATE
#define FRONTEND_EXIT_DB_ERROR GENERIC_EXIT_DB_ERROR

#define FRONTEND_EXIT_INVALID_TIMEZONE GENERIC_EXIT_INVALID_TIMEZONE
#define FRONTEND_BUGGY_EXIT_NO_THEME GENERIC_EXIT_NO_THEME
#define FRONTEND_BUGGY_EXIT_NO_SELECTOR GENERIC_EXIT_START+1
#define FRONTEND_EXIT_START GENERIC_EXIT_START+1

// mythbackend
#define BACKEND_EXIT_OK GENERIC_EXIT_OK
#define BACKEND_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define BACKEND_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define BACKEND_EXIT_DB_OUTOFDATE GENERIC_EXIT_DB_OUTOFDATE
#define BACKEND_EXIT_DB_ERROR GENERIC_EXIT_DB_ERROR
#define BACKEND_EXIT_INVALID_TIMEZONE GENERIC_EXIT_INVALID_TIMEZONE
#define BACKEND_EXIT_OPENING_LOGFILE_ERROR GENERIC_EXIT_OPENING_LOGFILE_ERROR
#define BACKEND_EXIT_NO_CONNECT GENERIC_EXIT_START+1
#define BACKEND_EXIT_NO_IP_ADDRESS GENERIC_EXIT_START+2
#define BACKEND_EXIT_CAP_CARD_SETUP_ERROR GENERIC_EXIT_START+3
#define BACKEND_EXIT_OPENING_PIDFILE_ERROR GENERIC_EXIT_START+4
#define BACKEND_EXIT_OPENING_VLOCKFILE_ERROR GENERIC_EXIT_START+5
#define BACKEND_EXIT_DAEMONIZING_ERROR GENERIC_EXIT_START+6

#define BACKEND_BUGGY_EXIT_NO_BIND_MAIN GENERIC_EXIT_START+7
#define BACKEND_BUGGY_EXIT_NO_BIND_STATUS GENERIC_EXIT_START+8
#define BACKEND_BUGGY_EXIT_UNKNOWN_ENC GENERIC_EXIT_START+9
#define BACKEND_BUGGY_EXIT_UNKNOWN_FILE_SOCK GENERIC_EXIT_START+10
#define BACKEND_EXIT_NO_CAP_CARD GENERIC_EXIT_START+11
#define BACKEND_EXIT_NO_CHAN_DATA GENERIC_EXIT_START+12
#define BACKEND_EXIT_PERMISSIONS_ERROR GENERIC_EXIT_START+13
#define BACKEND_EXIT_START GENERIC_EXIT_START+13

// mythtranscode
#define TRANSCODE_EXIT_OK GENERIC_EXIT_OK
#define TRANSCODE_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define TRANSCODE_EXIT_DB_ERROR GENERIC_EXIT_DB_ERROR
#define TRANSCODE_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define TRANSCODE_EXIT_UNKNOWN_ERROR GENERIC_EXIT_UNKNOWN_ERROR
#define TRANSCODE_EXIT_NO_RECORDING_DATA GENERIC_EXIT_START+1
#define TRANSCODE_EXIT_REMOTE_FILE GENERIC_EXIT_START+2
#define TRANSCODE_EXIT_ERROR_CUTLIST_UPDATE GENERIC_EXIT_START+3
#define TRANSCODE_EXIT_STOPPED GENERIC_EXIT_START+4

#define TRANSCODE_BUGGY_EXIT_INVALID_MARKER GENERIC_EXIT_START+5
#define TRANSCODE_BUGGY_EXIT_NO_AUDIO_BUFFERS GENERIC_EXIT_START+6
#define TRANSCODE_BUGGY_EXIT_NO_VIDEO_BUFFERS GENERIC_EXIT_START+7
#define TRANSCODE_BUGGY_EXIT_INVALID_OUT_PARAMS GENERIC_EXIT_START+8
#define TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR GENERIC_EXIT_START+9
#define TRANSCODE_BUGGY_EXIT_INVALID_AUDIO GENERIC_EXIT_START+10
#define TRANSCODE_BUGGY_EXIT_INVALID_VIDEO GENERIC_EXIT_START+11
#define TRANSCODE_BUGGY_EXIT_DEADLOCK GENERIC_EXIT_START+12
#define TRANSCODE_EXIT_RESTART GENERIC_EXIT_START+13
#define TRANSCODE_EXIT_START GENERIC_EXIT_START+13

// mythfilldatabase
#define FILLDB_EXIT_OK GENERIC_EXIT_OK
#define FILLDB_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define FILLDB_EXIT_DB_ERROR GENERIC_EXIT_DB_ERROR
#define FILLDB_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define FILLDB_EXIT_NO_CHAN_SRC GENERIC_EXIT_START+1
#define FILLDB_EXIT_UNKNOWN_ICON_GROUP GENERIC_EXIT_START+2
#define FILLDB_EXIT_GRAB_DATA_FAILED GENERIC_EXIT_START+3

#define FILLDB_BUGGY_EXIT_SRC_IS_DD GENERIC_EXIT_START+4
#define FILLDB_EXIT_START GENERIC_EXIT_START+4

// mythjobqueue
#define JOBQUEUE_EXIT_OK GENERIC_EXIT_OK
#define JOBQUEUE_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define JOBQUEUE_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define JOBQUEUE_EXIT_OPENING_PIDFILE_ERROR GENERIC_EXIT_START+1
#define JOBQUEUE_EXIT_DAEMONIZING_ERROR GENERIC_EXIT_START+2
#define JOBQUEUE_EXIT_START GENERIC_EXIT_START+2

// mythtv
#define TV_EXIT_OK GENERIC_EXIT_OK
#define TV_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define TV_EXIT_NO_THEME GENERIC_EXIT_NO_THEME
#define TV_EXIT_NO_AUDIO GENERIC_EXIT_START+1
#define TV_EXIT_NO_TV GENERIC_EXIT_START+2
#define TV_EXIT_START GENERIC_EXIT_START+2

// mythmessage
#define MESSAGE_EXIT_OK GENERIC_EXIT_OK
#define MESSAGE_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define MESSAGE_EXIT_SOCKET_ERROR GENERIC_EXIT_SOCKET_ERROR
#define MESSAGE_EXIT_NO_TEMPLATE GENERIC_EXIT_START+1
#define MESSAGE_EXIT_START GENERIC_EXIT_START+1

// mythwelcome
#define WELCOME_BUGGY_EXIT_NO_THEME GENERIC_EXIT_NO_THEME

// Commercial flagging should return number of breaks,
// or one of these exit codes
#define COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS GENERIC_EXIT_OK

#define COMMFLAG_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define COMMFLAG_EXIT_DB_ERROR GENERIC_EXIT_DB_ERROR
#define COMMFLAG_EXIT_INVALID_CHANID GENERIC_EXIT_START+1
#define COMMFLAG_EXIT_INVALID_STARTTIME GENERIC_EXIT_START+2
#define COMMFLAG_EXIT_INVALID_CMDLINE GENERIC_EXIT_START+3
#define COMMFLAG_EXIT_NO_PROGRAM_DATA GENERIC_EXIT_START+4
#define COMMFLAG_EXIT_IN_USE GENERIC_EXIT_START+5
#define COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA GENERIC_EXIT_START+6
#define COMMFLAG_EXIT_NO_RINGBUFFER GENERIC_EXIT_START+7
#define COMMFLAG_EXIT_START GENERIC_EXIT_START+7

// MythPreviewGen
#define PREVIEWGEN_EXIT_OK GENERIC_EXIT_OK
#define PREVIEWGEN_EXIT_NOT_OK GENERIC_EXIT_NOT_OK
#define PREVIEWGEN_EXIT_NO_MYTHCONTEXT GENERIC_EXIT_NO_MYTHCONTEXT
#define PREVIEWGEN_EXIT_INVALID_CMDLINE GENERIC_EXIT_INVALID_CMDLINE
#define PREVIEWGEN_EXIT_DB_ERROR GENERIC_EXIT_DB_ERROR
#define PREVIEWGEN_EXIT_DAEMONIZING_ERROR GENERIC_EXIT_START-1
// ALL statuses that are not to be mapped directly to an exit code *should*
// be > 128 so as to not show up as a commercial count on commflag runs.
// However, they *must* be <= 255 as exit codes only can be 8-bits.
// Additionally, the functionality of mythwelcome/welcomedialog.cpp depends on
// being able to use exit code as an 8-bit masked integer.

#define GENERIC_EXIT_OK 0 ///< Exited with no error
#define GENERIC_EXIT_NOT_OK 128 ///< Exited with error
#define GENERIC_EXIT_CMD_NOT_FOUND 129 ///< Command not found
#define GENERIC_EXIT_NO_MYTHCONTEXT 130 ///< No MythContext available
#define GENERIC_EXIT_NO_THEME 131 ///< No Theme available
#define GENERIC_EXIT_INVALID_CMDLINE 132 ///< Command line parse error
#define GENERIC_EXIT_DB_OUTOFDATE 133 ///< Database needs upgrade
#define GENERIC_EXIT_DB_ERROR 134 ///< Database error
#define GENERIC_EXIT_SOCKET_ERROR 135 ///< Socket error
#define GENERIC_EXIT_PERMISSIONS_ERROR 136 ///< File permissions error
#define GENERIC_EXIT_CONNECT_ERROR 137 ///< Can't connect to master backend
#define GENERIC_EXIT_SETUP_ERROR 138 ///< Incorrectly setup system
#define GENERIC_EXIT_INVALID_TIMEZONE 139 ///< Invalid timezone
#define GENERIC_EXIT_KILLED 140 ///< Process killed or stopped
#define GENERIC_EXIT_TIMEOUT 141 ///< Process timed out
#define GENERIC_EXIT_RUNNING 142 ///< Process is running
#define GENERIC_EXIT_PIPE_FAILURE 143 ///< Error creating I/O pipes
#define GENERIC_EXIT_NO_HANDLER 144 ///< No MythSystem Handler
#define GENERIC_EXIT_DAEMONIZING_ERROR 145 ///< Error daemonizing or execl
#define GENERIC_EXIT_NO_RECORDING_DATA 146 ///< No program/recording data
#define GENERIC_EXIT_REMOTE_FILE 147 ///< Can't transcode a remote file
#define GENERIC_EXIT_RESTART 148 ///< Need to restart transcoding
#define GENERIC_EXIT_WRITE_FRAME_ERROR 149 ///< Frame write error
#define GENERIC_EXIT_DEADLOCK 150 ///< Transcode deadlock detected
#define GENERIC_EXIT_IN_USE 151 ///< Recording in use, can't flag
#define GENERIC_EXIT_START 152 ///< MythSystem process starting

#endif // __MYTH_EXIT_CODES__
15 changes: 5 additions & 10 deletions mythtv/libs/libmythbase/system-unix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,7 @@ void MythSystemManager::run(void)
// Don't override a timed out process which gets killed, but
// otherwise set the return status appropriately
int sig = WTERMSIG(status);
if( sig == 9 )
ms->SetStatus( GENERIC_EXIT_ABORTED );
else if( sig == 11 )
ms->SetStatus( GENERIC_EXIT_TERMINATED );
else
ms->SetStatus( GENERIC_EXIT_SIGNALLED );
ms->SetStatus( GENERIC_EXIT_KILLED );

VERBOSE(VB_SYSTEM,
QString("Managed child (PID: %1) has signalled! "
Expand Down Expand Up @@ -699,7 +694,7 @@ void MythSystemUnix::Fork(time_t timeout)
cerr << locerr
<< "Cannot redirect input pipe to standard input: "
<< strerror(errno) << endl;
_exit(MYTHSYSTEM__EXIT__PIPE_FAILURE);
_exit(GENERIC_EXIT_PIPE_FAILURE);
}
}
else
Expand Down Expand Up @@ -734,7 +729,7 @@ void MythSystemUnix::Fork(time_t timeout)
cerr << locerr
<< "Cannot redirect output pipe to standard output: "
<< strerror(errno) << endl;
_exit(MYTHSYSTEM__EXIT__PIPE_FAILURE);
_exit(GENERIC_EXIT_PIPE_FAILURE);
}
}

Expand All @@ -747,7 +742,7 @@ void MythSystemUnix::Fork(time_t timeout)
cerr << locerr
<< "Cannot redirect error pipe to standard error: "
<< strerror(errno) << endl;
_exit(MYTHSYSTEM__EXIT__PIPE_FAILURE);
_exit(GENERIC_EXIT_PIPE_FAILURE);
}
}

Expand Down Expand Up @@ -783,7 +778,7 @@ void MythSystemUnix::Fork(time_t timeout)
}

/* Failed to exec */
_exit(MYTHSYSTEM__EXIT__EXECL_ERROR); // this exit is ok
_exit(GENERIC_EXIT_DAEMONIZING_ERROR); // this exit is ok
}

/* Parent */
Expand Down
16 changes: 8 additions & 8 deletions mythtv/libs/libmythtv/jobqueue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1946,8 +1946,8 @@ void JobQueue::DoTranscodeThread(int jobID)
uint result = myth_system(command);
int status = GetJobStatus(jobID);

if ((result == MYTHSYSTEM__EXIT__EXECL_ERROR) ||
(result == MYTHSYSTEM__EXIT__CMD_NOT_FOUND))
if ((result == GENERIC_EXIT_DAEMONIZING_ERROR) ||
(result == GENERIC_EXIT_CMD_NOT_FOUND))
{
ChangeJobStatus(jobID, JOB_ERRORED,
"ERROR: Unable to find mythtranscode, check backend logs.");
Expand All @@ -1963,7 +1963,7 @@ void JobQueue::DoTranscodeThread(int jobID)
QString("%1 for %2").arg(msg).arg(details.constData()));
gCoreContext->LogEntry("transcode", LP_WARNING, msg, detailstr);
}
else if (result == TRANSCODE_EXIT_RESTART && retrylimit > 0)
else if (result == GENERIC_EXIT_RESTART && retrylimit > 0)
{
VERBOSE(VB_JOBQUEUE, LOC + "Transcode command restarting");
retry = true;
Expand Down Expand Up @@ -2135,8 +2135,8 @@ void JobQueue::DoFlagCommercialsThread(int jobID)

runningJobsLock->lock();

if ((breaksFound == MYTHSYSTEM__EXIT__EXECL_ERROR) ||
(breaksFound == MYTHSYSTEM__EXIT__CMD_NOT_FOUND))
if ((breaksFound == GENERIC_EXIT_DAEMONIZING_ERROR) ||
(breaksFound == GENERIC_EXIT_CMD_NOT_FOUND))
{
comment = tr("Unable to find mythcommflag");
ChangeJobStatus(jobID, JOB_ERRORED, comment);
Expand All @@ -2148,7 +2148,7 @@ void JobQueue::DoFlagCommercialsThread(int jobID)
ChangeJobStatus(jobID, JOB_ABORTED, comment);
priority = LP_WARNING;
}
else if (breaksFound == COMMFLAG_EXIT_NO_PROGRAM_DATA)
else if (breaksFound == GENERIC_EXIT_NO_RECORDING_DATA)
{
comment = tr("Unable to open file or init decoder");
ChangeJobStatus(jobID, JOB_ERRORED, comment);
Expand Down Expand Up @@ -2252,8 +2252,8 @@ void JobQueue::DoUserJobThread(int jobID)
.arg(command));
uint result = myth_system(command);

if ((result == MYTHSYSTEM__EXIT__EXECL_ERROR) ||
(result == MYTHSYSTEM__EXIT__CMD_NOT_FOUND))
if ((result == GENERIC_EXIT_DAEMONIZING_ERROR) ||
(result == GENERIC_EXIT_CMD_NOT_FOUND))
{
msg = QString("User Job '%1' failed, unable to find "
"executable, check your PATH and backend logs.")
Expand Down
14 changes: 7 additions & 7 deletions mythtv/programs/mythavtest/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ int main(int argc, char *argv[])
if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
{
if (cmdline_err)
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
if (cmdline.WantsToExit())
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand Down Expand Up @@ -146,7 +146,7 @@ int main(int argc, char *argv[])
if (!gContext->Init())
{
VERBOSE(VB_IMPORTANT, "Failed to init MythContext, exiting.");
return TV_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

gCoreContext->SetAppName(binname);
Expand Down Expand Up @@ -183,7 +183,7 @@ int main(int argc, char *argv[])
QString msg = QString("Fatal Error: Couldn't find theme '%1'.")
.arg(themename);
VERBOSE(VB_IMPORTANT, msg);
return TV_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

GetMythUI()->LoadQtConfig();
Expand All @@ -196,7 +196,7 @@ int main(int argc, char *argv[])
{
VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need "
"to run 'mythfrontend', not 'mythtv'.");
return TV_EXIT_NO_AUDIO;
return GENERIC_EXIT_SETUP_ERROR;
}
#endif

Expand All @@ -216,7 +216,7 @@ int main(int argc, char *argv[])
if (!tv->Init())
{
VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initialize TV class.");
return TV_EXIT_NO_TV;
return GENERIC_EXIT_NOT_OK;
}

if (filename.isEmpty())
Expand All @@ -236,7 +236,7 @@ int main(int argc, char *argv[])
}
delete gContext;

return TV_EXIT_OK;
return GENERIC_EXIT_OK;
}

/* vim: set expandtab tabstop=4 shiftwidth=4: */
14 changes: 7 additions & 7 deletions mythtv/programs/mythbackend/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ int main(int argc, char **argv)
if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
{
if (cmdline_err)
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand All @@ -131,17 +131,17 @@ int main(int argc, char **argv)
if (cmdline.Parse(a.argc(), a.argv(), argpos, cmdline_err))
{
if (cmdline_err)
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
cerr << "Invalid argument: " << a.argv()[argpos] << endl;
QByteArray help = cmdline.GetHelpString(true).toLocal8Bit();
cout << help.constData();
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -158,7 +158,7 @@ int main(int argc, char **argv)
CleanupGuard callCleanup(cleanup);

int exitCode = setup_basics(cmdline);
if (BACKEND_EXIT_OK != exitCode)
if (exitCode != GENERIC_EXIT_OK)
return exitCode;

{
Expand All @@ -176,7 +176,7 @@ int main(int argc, char **argv)
if (cmdline.HasBackendCommand())
{
if (!setup_context(cmdline))
return BACKEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
return handle_command(cmdline);
}

Expand Down
50 changes: 25 additions & 25 deletions mythtv/programs/mythbackend/main_helpers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,16 +414,16 @@ int handle_command(const MythCommandLineParser &cmdline)
}

RemoteSendMessage(eventString);
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
return BACKEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

if (cmdline.WantUPnPRebuild())
{
VERBOSE(VB_GENERAL, "Rebuilding UPNP Media Map is no longer supported. Rescan videos using MythVideo.");

return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

if (cmdline.SetVerbose())
Expand All @@ -435,13 +435,13 @@ int handle_command(const MythCommandLineParser &cmdline)

RemoteSendMessage(message);
VERBOSE(VB_IMPORTANT, QString("Sent '%1' message").arg(message));
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
VERBOSE(VB_IMPORTANT,
"Unable to connect to backend, verbose level unchanged ");
return BACKEND_EXIT_NO_CONNECT;
return GENERIC_EXIT_CONNECT_ERROR;
}
}

Expand All @@ -451,13 +451,13 @@ int handle_command(const MythCommandLineParser &cmdline)
{
RemoteSendMessage("CLEAR_SETTINGS_CACHE");
VERBOSE(VB_IMPORTANT, "Sent CLEAR_SETTINGS_CACHE message");
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
VERBOSE(VB_IMPORTANT, "Unable to connect to backend, settings "
"cache will not be cleared.");
return BACKEND_EXIT_NO_CONNECT;
return GENERIC_EXIT_CONNECT_ERROR;
}
}

Expand All @@ -481,7 +481,7 @@ int handle_command(const MythCommandLineParser &cmdline)

print_verbose_messages |= VB_SCHEDULE;
sched->PrintList(true);
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

if (cmdline.Reschedule())
Expand All @@ -496,7 +496,7 @@ int handle_command(const MythCommandLineParser &cmdline)
else
VERBOSE(VB_IMPORTANT, "Cannot connect to master for reschedule");

return (ok) ? BACKEND_EXIT_OK : BACKEND_EXIT_NO_CONNECT;
return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_CONNECT_ERROR;
}

if (cmdline.ScanVideos())
Expand All @@ -511,18 +511,18 @@ int handle_command(const MythCommandLineParser &cmdline)
else
VERBOSE(VB_IMPORTANT, "Cannot connect to master for video scan");

return (ok) ? BACKEND_EXIT_OK : BACKEND_EXIT_NO_CONNECT;
return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_CONNECT_ERROR;
}

if (!cmdline.GetPrintExpire().isEmpty())
{
expirer = new AutoExpire();
expirer->PrintExpireList(cmdline.GetPrintExpire());
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

// This should never actually be reached..
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

int connect_to_master(void)
Expand All @@ -536,7 +536,7 @@ int connect_to_master(void)
{
VERBOSE(VB_IMPORTANT, "Master backend is incompatible with "
"this backend.\nCannot become a slave.");
return BACKEND_EXIT_NO_CONNECT;
return GENERIC_EXIT_CONNECT_ERROR;
}

QStringList tempMonitorDone("DONE");
Expand Down Expand Up @@ -583,7 +583,7 @@ int connect_to_master(void)
"Unable to run with invalid time settings. Exiting.");
tempMonitorConnection->writeStringList(tempMonitorDone);
tempMonitorConnection->DownRef();
return BACKEND_EXIT_INVALID_TIMEZONE;
return GENERIC_EXIT_INVALID_TIMEZONE;
}
else
{
Expand All @@ -597,35 +597,35 @@ int connect_to_master(void)
if (tempMonitorConnection)
tempMonitorConnection->DownRef();

return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

int setup_basics(const MythCommandLineParser &cmdline)
{
ofstream pidfs;
if (!openPidfile(pidfs, cmdline.GetPIDFilename()))
return BACKEND_EXIT_OPENING_PIDFILE_ERROR;
return GENERIC_EXIT_PERMISSIONS_ERROR;

if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
VERBOSE(VB_IMPORTANT, LOC_WARN + "Unable to ignore SIGPIPE");

if (cmdline.IsDaemonizeEnabled() && (daemon(0, 1) < 0))
{
VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to daemonize" + ENO);
return BACKEND_EXIT_DAEMONIZING_ERROR;
return GENERIC_EXIT_DAEMONIZING_ERROR;
}

QString username = cmdline.GetUsername();
if (!username.isEmpty() && !setUser(username))
return BACKEND_EXIT_PERMISSIONS_ERROR;
return GENERIC_EXIT_PERMISSIONS_ERROR;

if (pidfs)
{
pidfs << getpid() << endl;
pidfs.close();
}

return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

void print_warnings(const MythCommandLineParser &cmdline)
Expand Down Expand Up @@ -659,12 +659,12 @@ void print_warnings(const MythCommandLineParser &cmdline)
int run_backend(const MythCommandLineParser &cmdline)
{
if (!setup_context(cmdline))
return BACKEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;

if (!UpgradeTVDatabaseSchema(true, true))
{
VERBOSE(VB_IMPORTANT, "Couldn't upgrade database to new schema");
return BACKEND_EXIT_DB_OUTOFDATE;
return GENERIC_EXIT_DB_OUTOFDATE;
}

///////////////////////////////////////////
Expand All @@ -676,7 +676,7 @@ int run_backend(const MythCommandLineParser &cmdline)
if (!ismaster)
{
int ret = connect_to_master();
if (BACKEND_EXIT_OK != ret)
if (ret != GENERIC_EXIT_OK)
return ret;
}

Expand All @@ -687,7 +687,7 @@ int run_backend(const MythCommandLineParser &cmdline)
cerr << "No setting found for this machine's BackendServerIP.\n"
<< "Please run setup on this machine and modify the first page\n"
<< "of the general settings.\n";
return BACKEND_EXIT_NO_IP_ADDRESS;
return GENERIC_EXIT_SETUP_ERROR;
}

MythSystemEventHandler *sysEventHandler = new MythSystemEventHandler();
Expand All @@ -712,7 +712,7 @@ int run_backend(const MythCommandLineParser &cmdline)
if (fatal_error)
{
delete sysEventHandler;
return BACKEND_EXIT_CAP_CARD_SETUP_ERROR;
return GENERIC_EXIT_SETUP_ERROR;
}

if (ismaster)
Expand Down Expand Up @@ -765,7 +765,7 @@ int run_backend(const MythCommandLineParser &cmdline)
ismaster, port, &tvList, sched, expirer);

int exitCode = mainServer->GetExitCode();
if (exitCode != BACKEND_EXIT_OK)
if (exitCode != GENERIC_EXIT_OK)
{
VERBOSE(VB_IMPORTANT, "Backend exiting, MainServer initialization "
"error.");
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythbackend/mainserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ MainServer::MainServer(bool master, int port,
encoderList(tvList), mythserver(NULL), masterServerReconnect(NULL),
masterServer(NULL), ismaster(master), masterBackendOverride(false),
m_sched(sched), m_expirer(expirer), deferredDeleteTimer(NULL),
autoexpireUpdateTimer(NULL), m_exitCode(BACKEND_EXIT_OK)
autoexpireUpdateTimer(NULL), m_exitCode(GENERIC_EXIT_OK)
{
PreviewGeneratorQueue::CreatePreviewGeneratorQueue(
PreviewGenerator::kLocalAndRemote, ~0, 0);
Expand All @@ -204,7 +204,7 @@ MainServer::MainServer(bool master, int port,
{
VERBOSE(VB_IMPORTANT, QString("Failed to bind port %1. Exiting.")
.arg(port));
SetExitCode(BACKEND_BUGGY_EXIT_NO_BIND_MAIN, false);
SetExitCode(GENERIC_EXIT_SOCKET_ERROR, false);
return;
}

Expand Down
1 change: 0 additions & 1 deletion mythtv/programs/mythbackend/mediaserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ MediaServer::MediaServer( bool bIsMaster, bool bDisableUPnp /* = FALSE */ )
if (!m_pHttpServer->listen(QHostAddress::Any, nPort))
{
VERBOSE(VB_IMPORTANT, "MediaServer::HttpServer Create Error");
// exit(BACKEND_BUGGY_EXIT_NO_BIND_STATUS);
delete m_pHttpServer;
m_pHttpServer = NULL;
return;
Expand Down
8 changes: 4 additions & 4 deletions mythtv/programs/mythbackend/scheduler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ bool Scheduler::VerifyCards(void)
if (!query.exec("SELECT count(*) FROM capturecard") || !query.next())
{
MythDB::DBError("verifyCards() -- main query 1", query);
error = BACKEND_EXIT_NO_CAP_CARD;
error = GENERIC_EXIT_DB_ERROR;
return false;
}

Expand All @@ -155,7 +155,7 @@ bool Scheduler::VerifyCards(void)
VERBOSE(VB_IMPORTANT, LOC_ERR +
"No capture cards are defined in the database.\n\t\t\t"
"Perhaps you should re-read the installation instructions?");
error = BACKEND_EXIT_NO_CAP_CARD;
error = GENERIC_EXIT_SETUP_ERROR;
return false;
}

Expand All @@ -164,7 +164,7 @@ bool Scheduler::VerifyCards(void)
if (!query.exec())
{
MythDB::DBError("verifyCards() -- main query 2", query);
error = BACKEND_EXIT_NO_CHAN_DATA;
error = GENERIC_EXIT_DB_ERROR;
return false;
}

Expand Down Expand Up @@ -200,7 +200,7 @@ bool Scheduler::VerifyCards(void)
{
VERBOSE(VB_IMPORTANT, LOC_ERR +
"No channel sources defined in the database");
error = BACKEND_EXIT_NO_CHAN_DATA;
error = GENERIC_EXIT_SETUP_ERROR;
return false;
}

Expand Down
76 changes: 38 additions & 38 deletions mythtv/programs/mythcommflag/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ static int BuildVideoMarkup(ProgramInfo *program_info, bool useDB)
{
VERBOSE(VB_IMPORTANT,
QString("Unable to create RingBuffer for %1").arg(filename));
return COMMFLAG_EXIT_NO_RINGBUFFER;
return GENERIC_EXIT_PERMISSIONS_ERROR;
}

if (useDB && !MSqlQuery::testDBConnection())
{
VERBOSE(VB_IMPORTANT, "Unable to open DB connection for commercial flagging.");
delete tmprbuf;
return COMMFLAG_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}

MythCommFlagPlayer *cfp = new MythCommFlagPlayer();
Expand All @@ -184,7 +184,7 @@ static int BuildVideoMarkup(ProgramInfo *program_info, bool useDB)

delete ctx;

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

static int QueueCommFlagJob(uint chanid, QString starttime)
Expand All @@ -201,7 +201,7 @@ static int QueueCommFlagJob(uint chanid, QString starttime)
.arg(chanid).arg(starttime);
cerr << tmp.toLocal8Bit().constData() << endl;
}
return COMMFLAG_EXIT_NO_PROGRAM_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

bool result = JobQueue::QueueJob(
Expand All @@ -215,7 +215,7 @@ static int QueueCommFlagJob(uint chanid, QString starttime)
.arg(chanid).arg(starttime);
cerr << tmp.toLocal8Bit().constData() << endl;
}
return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}
else
{
Expand All @@ -225,10 +225,10 @@ static int QueueCommFlagJob(uint chanid, QString starttime)
.arg(chanid).arg(starttime);
cerr << tmp.toLocal8Bit().constData() << endl;
}
return COMMFLAG_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

static int CopySkipListToCutList(QString chanid, QString starttime)
Expand All @@ -244,7 +244,7 @@ static int CopySkipListToCutList(QString chanid, QString starttime)
VERBOSE(VB_IMPORTANT,
QString("No program data exists for channel %1 at %2")
.arg(chanid).arg(starttime));
return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

pginfo.QueryCommBreakList(cutlist);
Expand All @@ -255,7 +255,7 @@ static int CopySkipListToCutList(QString chanid, QString starttime)
cutlist[it.key()] = MARK_CUT_END;
pginfo.SaveCutList(cutlist);

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

static int ClearSkipList(QString chanid, QString starttime)
Expand All @@ -268,15 +268,15 @@ static int ClearSkipList(QString chanid, QString starttime)
VERBOSE(VB_IMPORTANT,
QString("No program data exists for channel %1 at %2")
.arg(chanid).arg(starttime));
return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

frm_dir_map_t skiplist;
pginfo.SaveCommBreakList(skiplist);

VERBOSE(VB_IMPORTANT, "Commercial skip list cleared");

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

static int SetCutList(QString chanid, QString starttime, QString newCutList)
Expand All @@ -302,14 +302,14 @@ static int SetCutList(QString chanid, QString starttime, QString newCutList)
VERBOSE(VB_IMPORTANT,
QString("No program data exists for channel %1 at %2")
.arg(chanid).arg(starttime));
return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

pginfo.SaveCutList(cutlist);

VERBOSE(VB_IMPORTANT, QString("Cutlist set to: %1").arg(newCutList));

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

static int GetMarkupList(QString list, QString chanid, QString starttime)
Expand All @@ -326,7 +326,7 @@ static int GetMarkupList(QString list, QString chanid, QString starttime)
VERBOSE(VB_IMPORTANT,
QString("No program data exists for channel %1 at %2")
.arg(chanid).arg(starttime));
return COMMFLAG_BUGGY_EXIT_NO_CHAN_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

if (list == "cutlist")
Expand Down Expand Up @@ -368,7 +368,7 @@ static int GetMarkupList(QString list, QString chanid, QString starttime)
.arg(result).toLocal8Bit().constData();
}

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

static void streamOutCommercialBreakList(
Expand Down Expand Up @@ -717,7 +717,7 @@ static int FlagCommercials(
0, NULL, outputfilename);

global_program_info = NULL;
return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}


Expand Down Expand Up @@ -747,7 +747,7 @@ static int FlagCommercials(
"(the program is already being flagged elsewhere)\n";
}
global_program_info = NULL;
return COMMFLAG_EXIT_IN_USE;
return GENERIC_EXIT_IN_USE;
}

QString filename = get_filename(program_info);
Expand All @@ -758,15 +758,15 @@ static int FlagCommercials(
VERBOSE(VB_IMPORTANT,
QString("Unable to create RingBuffer for %1").arg(filename));
global_program_info = NULL;
return COMMFLAG_EXIT_NO_RINGBUFFER;
return GENERIC_EXIT_PERMISSIONS_ERROR;
}

if (useDB && !MSqlQuery::testDBConnection())
{
VERBOSE(VB_IMPORTANT, "Unable to open commflag DB connection");
delete tmprbuf;
global_program_info = NULL;
return COMMFLAG_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}

MythCommFlagPlayer *cfp = new MythCommFlagPlayer();
Expand Down Expand Up @@ -802,7 +802,7 @@ static int FlagCommercials(
delete ctx;
global_program_info = NULL;

return COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
return GENERIC_EXIT_OK;
}

if (program_info->GetRecordingEndTime() > QDateTime::currentDateTime())
Expand Down Expand Up @@ -882,7 +882,7 @@ static int FlagCommercials(
VERBOSE(VB_IMPORTANT,
QString("No program data exists for channel %1 at %2")
.arg(chanid).arg(starttime));
return COMMFLAG_EXIT_NO_PROGRAM_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

int ret = FlagCommercials(&pginfo, outputfilename, useDB);
Expand All @@ -895,7 +895,7 @@ int main(int argc, char *argv[])
QCoreApplication a(argc, argv);
int argpos = 1;
bool isVideo = false;
int result = COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS;
int result = GENERIC_EXIT_OK;

QString filename;
QString outputfilename = QString::null;
Expand Down Expand Up @@ -941,7 +941,7 @@ int main(int argc, char *argv[])
{
VERBOSE(VB_IMPORTANT,
"Missing or invalid parameters for --chanid option");
return COMMFLAG_EXIT_INVALID_CHANID;
return GENERIC_EXIT_INVALID_CMDLINE;
}

chanid = QString(a.argv()[++argpos]).toUInt();
Expand All @@ -954,7 +954,7 @@ int main(int argc, char *argv[])
{
VERBOSE(VB_IMPORTANT,
"Missing or invalid parameters for --starttime option");
return COMMFLAG_EXIT_INVALID_STARTTIME;
return GENERIC_EXIT_INVALID_CMDLINE;
}

starttime += a.argv()[++argpos];
Expand Down Expand Up @@ -1087,7 +1087,7 @@ int main(int argc, char *argv[])
!strncmp(a.argv()[argpos + 1], "--", 2))
{
cerr << "Missing or invalid parameter for --allstart\n";
return COMMFLAG_EXIT_INVALID_STARTTIME;
return GENERIC_EXIT_INVALID_CMDLINE;
}

allStart = a.argv()[++argpos];
Expand All @@ -1098,7 +1098,7 @@ int main(int argc, char *argv[])
!strncmp(a.argv()[argpos + 1], "--", 2))
{
cerr << "Missing or invalid parameter for --allend\n";
return COMMFLAG_EXIT_INVALID_STARTTIME;
return GENERIC_EXIT_INVALID_CMDLINE;
}

allEnd = a.argv()[++argpos];
Expand Down Expand Up @@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
else
{
VERBOSE(VB_IMPORTANT, "Missing argument to -V option");
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-v") ||
Expand All @@ -1184,21 +1184,21 @@ int main(int argc, char *argv[])
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

++argpos;
}
else
{
VERBOSE(VB_IMPORTANT,
"Missing argument to -v/--verbose option");
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (cmdline.Parse(a.argc(), a.argv(), argpos, cmdline_err))
{
if (cmdline_err)
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else if (!strcmp(a.argv()[argpos],"-h") ||
!strcmp(a.argv()[argpos],"--help"))
Expand Down Expand Up @@ -1246,13 +1246,13 @@ int main(int argc, char *argv[])
" if either is used.\n\n"
"If no command line arguments are specified, all\n"
"unflagged videos will be flagged.\n\n");
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
VERBOSE(VB_IMPORTANT, QString("Illegal option: '%1' (use --help)")
.arg(a.argv()[argpos]));
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

++argpos;
Expand All @@ -1266,7 +1266,7 @@ int main(int argc, char *argv[])
false/*bypass auto discovery*/, !useDB/*ignoreDB*/))
{
VERBOSE(VB_IMPORTANT, "Failed to init MythContext, exiting.");
return COMMFLAG_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

gCoreContext->SetAppName(binname);
Expand Down Expand Up @@ -1296,7 +1296,7 @@ int main(int argc, char *argv[])
{
cerr << "mythcommflag: ERROR: Unable to find DB info for "
<< "JobQueue ID# " << jobID << endl;
return COMMFLAG_EXIT_NO_PROGRAM_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}
}

Expand All @@ -1316,7 +1316,7 @@ int main(int argc, char *argv[])
{
cerr << "mythcommflag: ERROR: Unable to find DB info for "
<< fullfile.dirName().toLocal8Bit().constData() << endl;
return COMMFLAG_EXIT_NO_PROGRAM_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}
}

Expand All @@ -1325,7 +1325,7 @@ int main(int argc, char *argv[])
{
VERBOSE(VB_IMPORTANT, "You must specify both the Channel ID "
"and the Start Time.");
return COMMFLAG_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (clearSkiplist)
Expand Down Expand Up @@ -1452,7 +1452,7 @@ int main(int argc, char *argv[])
(filename.right(4).toLower() == "mpeg"))
{
result = BuildVideoMarkup(pginfo, useDB);
if (COMMFLAG_EXIT_NO_ERROR_WITH_NO_BREAKS != result)
if (result != GENERIC_EXIT_OK)
{
VERBOSE(VB_IMPORTANT, LOC_ERR +
"Failed to build video markup");
Expand Down Expand Up @@ -1566,7 +1566,7 @@ int main(int argc, char *argv[])
else
{
MythDB::DBError("Querying recorded programs", query);
return COMMFLAG_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}
}

Expand Down
4 changes: 1 addition & 3 deletions mythtv/programs/mythfilldatabase/filldata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,7 @@ bool FillData::GrabData(Source source, int offset, QDate *qCurrentDate)

if (!succeeded)
{
if (systemcall_status == GENERIC_EXIT_SIGNALLED ||
systemcall_status == GENERIC_EXIT_ABORTED ||
systemcall_status == GENERIC_EXIT_TERMINATED)
if (systemcall_status == GENERIC_EXIT_KILLED)
{
interrupted = true;
status = QString(QObject::tr("FAILED: xmltv ran but was interrupted."));
Expand Down
44 changes: 22 additions & 22 deletions mythtv/programs/mythfilldatabase/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ int main(int argc, char *argv[])
!strncmp(a.argv()[argpos + 2], "--", 2))
{
printf("missing or invalid parameters for --file option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (!fromfile_name.isEmpty())
{
printf("only one --file option allowed\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

fromfile_id = atoi(a.argv()[++argpos]);
Expand All @@ -150,13 +150,13 @@ int main(int argc, char *argv[])
!strncmp(a.argv()[argpos + 4], "--", 2))
{
printf("missing or invalid parameters for --dd-file option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (!fromfile_name.isEmpty())
{
printf("only one --dd-file option allowed\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

fromfile_id = atoi(a.argv()[++argpos]);
Expand All @@ -174,13 +174,13 @@ int main(int argc, char *argv[])
!strncmp(a.argv()[argpos + 2], "--", 2))
{
printf("missing or invalid parameters for --xawchannels option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (!fromxawfile_name.isEmpty())
{
printf("only one --xawchannels option allowed\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

fromxawfile_id = atoi(a.argv()[++argpos]);
Expand All @@ -206,7 +206,7 @@ int main(int argc, char *argv[])
if (((argpos + 1) >= a.argc()))
{
printf("missing parameter for --graboptions option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

fill_data.graboptions = QString(" ") + QString(a.argv()[++argpos]);
Expand All @@ -216,7 +216,7 @@ int main(int argc, char *argv[])
if (((argpos + 1) >= a.argc()))
{
printf("missing parameter for --sourceid option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

sourceid = QString(a.argv()[++argpos]).toInt();
Expand All @@ -226,13 +226,13 @@ int main(int argc, char *argv[])
if (!sourceid)
{
printf("--cardtype option must follow a --sourceid option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (((argpos + 1) >= a.argc()))
{
printf("missing parameter for --cardtype option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

fill_data.chan_data.cardtype =
Expand All @@ -243,7 +243,7 @@ int main(int argc, char *argv[])
if (((argpos + 1) >= a.argc()))
{
printf("missing parameter for --max-days option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

fill_data.maxDays = QString(a.argv()[++argpos]).toUInt();
Expand Down Expand Up @@ -279,7 +279,7 @@ int main(int argc, char *argv[])
if (((argpos + 1) >= a.argc()))
{
printf("missing parameter for --refresh-day option\n");
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

bool ok = true;
Expand Down Expand Up @@ -394,7 +394,7 @@ int main(int argc, char *argv[])
{
cerr << "Unknown icon group '" << a.argv()[argpos]
<< "' for --reset-icon-map option" << endl;
return FILLDB_EXIT_UNKNOWN_ICON_GROUP;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
}
Expand Down Expand Up @@ -525,7 +525,7 @@ int main(int argc, char *argv[])
cout << "\n";
cout << " --manual and --update cannot be used together.\n";
cout << "\n";
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else if (!strcmp(a.argv()[argpos], "--no-delete"))
{
Expand All @@ -541,7 +541,7 @@ int main(int argc, char *argv[])
{
fprintf(stderr, "illegal option: '%s' (use --help)\n",
a.argv()[argpos]);
return FILLDB_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

++argpos;
Expand All @@ -553,7 +553,7 @@ int main(int argc, char *argv[])
if (!gContext->Init(false))
{
VERBOSE(VB_IMPORTANT, "Failed to init MythContext, exiting.");
return FILLDB_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

gCoreContext->SetAppName(binname);
Expand Down Expand Up @@ -599,7 +599,7 @@ int main(int argc, char *argv[])

if (!fill_data.GrabDataFromFile(fromfile_id, fromfile_name))
{
return FILLDB_EXIT_GRAB_DATA_FAILED;
return GENERIC_EXIT_NOT_OK;
}

updateLastRunEnd(query);
Expand Down Expand Up @@ -685,13 +685,13 @@ int main(int argc, char *argv[])
"Could not find any defined channel "
"sources - did you run the setup "
"program?");
return FILLDB_EXIT_NO_CHAN_SRC;
return GENERIC_EXIT_SETUP_ERROR;
}
}
else
{
MythDB::DBError("loading channel sources", sourcequery);
return FILLDB_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}

if (!fill_data.Run(sourcelist))
Expand All @@ -706,7 +706,7 @@ int main(int argc, char *argv[])

if (fill_data.only_update_channels && !fill_data.need_post_grab_proc)
{
return FILLDB_EXIT_OK;
return GENERIC_EXIT_OK;
}

if (reset_iconmap)
Expand All @@ -731,7 +731,7 @@ int main(int argc, char *argv[])
if (!query.exec())
{
MythDB::DBError("Querying sources", query);
return FILLDB_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}

while (query.next())
Expand Down Expand Up @@ -995,7 +995,7 @@ int main(int argc, char *argv[])

VERBOSE(VB_IMPORTANT, "mythfilldatabase run complete.");

return FILLDB_EXIT_OK;
return GENERIC_EXIT_OK;
}

/* vim: set expandtab tabstop=4 shiftwidth=4: */
2 changes: 1 addition & 1 deletion mythtv/programs/mythfilldatabase/xmltvparser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ bool XMLTVParser::parseFile(
{
VERBOSE(VB_IMPORTANT, "Don't use tv_grab_na_dd, use the"
"internal datadirect grabber.");
exit(FILLDB_BUGGY_EXIT_SRC_IS_DD);
exit(GENERIC_EXIT_SETUP_ERROR);
}

QString aggregatedTitle;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/backendconnectionmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void BackendConnectionManager::customEvent(QEvent *event)
{
delete error;
delete popupStack;
qApp->exit(FRONTEND_EXIT_INVALID_TIMEZONE);
qApp->exit(GENERIC_EXIT_INVALID_TIMEZONE);
}
}
m_first_time = false;
Expand Down
42 changes: 21 additions & 21 deletions mythtv/programs/mythfrontend/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ static int reloadTheme(void)
VERBOSE(VB_IMPORTANT, QString("Couldn't find theme '%1'")
.arg(themename));
cleanup();
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

MythTranslation::reload();
Expand All @@ -902,7 +902,7 @@ static int reloadTheme(void)
GetMythMainWindow()->SetEffectsEnabled(true);

if (!RunMenu(themedir, themename) && !resetTheme(themedir, themename))
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;

LCD::SetupLCD();
if (LCD *lcd = LCD::Get())
Expand Down Expand Up @@ -1155,7 +1155,7 @@ int main(int argc, char **argv)
if (arg == "-h" || arg == "--help" || arg == "--usage")
{
ShowUsage(cmdline);
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand All @@ -1164,9 +1164,9 @@ int main(int argc, char **argv)
if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
{
if (cmdline_err)
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
if (cmdline.WantsToExit())
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand Down Expand Up @@ -1218,7 +1218,7 @@ int main(int argc, char **argv)
{
cerr << "Invalid or missing argument"
" to -l/--logfile option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
Expand All @@ -1228,15 +1228,15 @@ int main(int argc, char **argv)
else
{
cerr << "Missing argument to -l/--logfile option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (cmdline.Parse(a.argc(), a.argv(), argpos, cmdline_err))
{
if (cmdline_err)
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
if (cmdline.WantsToExit())
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}
QMap<QString,QString> settingsOverride = cmdline.GetSettingsOverride();
Expand Down Expand Up @@ -1296,7 +1296,7 @@ int main(int argc, char **argv)
if (!gContext->Init(true, g_pUPnp, bPromptForBackend, bBypassAutoDiscovery))
{
VERBOSE(VB_IMPORTANT, "Failed to init MythContext, exiting.");
return FRONTEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

if (!GetMythDB()->HaveSchema())
Expand Down Expand Up @@ -1342,12 +1342,12 @@ int main(int argc, char **argv)
{
if (cmdline_err)
{
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (cmdline.WantsToExit())
{
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}
else if ((argpos + 1 == a.argc()) &&
Expand All @@ -1359,7 +1359,7 @@ int main(int argc, char **argv)
{
cerr << "Invalid argument: " << a.argv()[argpos] << endl;
ShowUsage(cmdline);
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -1374,7 +1374,7 @@ int main(int argc, char **argv)
.arg(*it).arg(value);
cout << out.toLocal8Bit().constData() << endl;
}
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

QString fileprefix = GetConfDir();
Expand All @@ -1392,7 +1392,7 @@ int main(int argc, char **argv)
gCoreContext->SaveSetting("Language", "");
gCoreContext->SaveSetting("Country", "");

return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

// Create privileged thread, then drop privs
Expand Down Expand Up @@ -1428,7 +1428,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT, QString("Couldn't find theme '%1'")
.arg(themename));
return FRONTEND_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

GetMythUI()->LoadQtConfig();
Expand All @@ -1439,7 +1439,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT, QString("Couldn't find theme '%1'")
.arg(themename));
return FRONTEND_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

MythMainWindow *mainWindow = GetMythMainWindow();
Expand All @@ -1450,7 +1450,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT,
"Couldn't upgrade database to new schema, exiting.");
return FRONTEND_EXIT_DB_OUTOFDATE;
return GENERIC_EXIT_DB_OUTOFDATE;
}

WriteDefaults();
Expand Down Expand Up @@ -1481,10 +1481,10 @@ int main(int argc, char **argv)
{
qApp->exec();

return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
Expand All @@ -1507,7 +1507,7 @@ int main(int argc, char **argv)

if (!RunMenu(themedir, themename) && !resetTheme(themedir, themename))
{
return FRONTEND_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

// Setup handler for USR1 signals to reload theme
Expand Down
2 changes: 0 additions & 2 deletions mythtv/programs/mythfrontend/mediarenderer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ MediaRenderer::MediaRenderer()
if (!m_pHttpServer->listen(QHostAddress::Any, nPort))
{
VERBOSE(VB_IMPORTANT, "MediaRenderer::HttpServer Create Error");
// exit(BACKEND_BUGGY_EXIT_NO_BIND_STATUS);
delete m_pHttpServer;
m_pHttpServer = NULL;
InitializeSSDPOnly();
Expand Down Expand Up @@ -281,7 +280,6 @@ MediaRenderer::MediaRenderer()
else
{
VERBOSE(VB_IMPORTANT, "MediaRenderer::Unable to Initialize UPnp Stack");
// exit(BACKEND_BUGGY_EXIT_NO_BIND_STATUS);
}


Expand Down
32 changes: 16 additions & 16 deletions mythtv/programs/mythjobqueue/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ int main(int argc, char *argv[])
if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
{
if (cmdline_err)
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return JOBQUEUE_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand All @@ -144,13 +144,13 @@ int main(int argc, char *argv[])
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

++argpos;
} else
{
cerr << "Missing argument to -v/--verbose option\n";
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-l") ||
Expand All @@ -162,7 +162,7 @@ int main(int argc, char *argv[])
if (logfile.startsWith("-"))
{
cerr << "Invalid or missing argument to -l/--logfile option\n";
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
Expand All @@ -179,7 +179,7 @@ int main(int argc, char *argv[])
if (pidfile.startsWith("-"))
{
cerr << "Invalid or missing argument to -p/--pidfile option\n";
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
Expand All @@ -202,7 +202,7 @@ int main(int argc, char *argv[])
{
cerr << "Invalid or missing argument to "
"-O/--override-setting option\n";
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

QStringList pairs = tmpArg.split(",");
Expand Down Expand Up @@ -234,20 +234,20 @@ int main(int argc, char *argv[])
"-p or --pidfile filename Write PID of mythjobqueue to filename " <<
"-d or --daemon Runs mythjobqueue as a daemon" << endl <<
endl;
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else if (cmdline.Parse(a.argc(), a.argv(), argpos, cmdline_err))
{
if (cmdline_err)
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return JOBQUEUE_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
printf("illegal option: '%s' (use --help)\n", a.argv()[argpos]);
return JOBQUEUE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

++argpos;
Expand All @@ -274,7 +274,7 @@ int main(int argc, char *argv[])
{
VERBOSE(VB_IMPORTANT, LOC_ERR +
"Could not open pid file" + ENO);
return JOBQUEUE_EXIT_OPENING_PIDFILE_ERROR;
return GENERIC_EXIT_PERMISSIONS_ERROR;
}
}

Expand All @@ -284,7 +284,7 @@ int main(int argc, char *argv[])
if (daemonize && (daemon(0, 1) < 0))
{
VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to daemonize" + ENO);
return JOBQUEUE_EXIT_DAEMONIZING_ERROR;
return GENERIC_EXIT_DAEMONIZING_ERROR;
}

if (pidfs)
Expand All @@ -305,7 +305,7 @@ int main(int argc, char *argv[])
if (!gContext->Init(false))
{
VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to init MythContext, exiting.");
return JOBQUEUE_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

gCoreContext->SetAppName(binname);
Expand All @@ -324,7 +324,7 @@ int main(int argc, char *argv[])
if (!gCoreContext->ConnectToMasterServer())
{
VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to connect to master server");
return GENERIC_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_CONNECT_ERROR;
}

jobqueue = new JobQueue(false);
Expand All @@ -336,7 +336,7 @@ int main(int argc, char *argv[])
if (sysEventHandler)
delete sysEventHandler;

return exitCode ? exitCode : JOBQUEUE_EXIT_OK;
return exitCode ? exitCode : GENERIC_EXIT_OK;
}

/* vim: set expandtab tabstop=4 shiftwidth=4: */
35 changes: 16 additions & 19 deletions mythtv/programs/mythlcdserver/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ using namespace std;

#include "lcdserver.h"

#define LCD_EXIT_DAEMONIZING_ERROR FRONTEND_EXIT_START-1
#define LCD_EXIT_NO_TRANSCODE_SUPPORT FRONTEND_EXIT_START-2

int main(int argc, char **argv)
{
QCoreApplication a(argc, argv);
Expand Down Expand Up @@ -64,14 +61,14 @@ int main(int argc, char **argv)
if (special_port < 1 || special_port > 65534)
{
VERBOSE(VB_IMPORTANT, "lcdserver: Bad port number");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else
{
VERBOSE(VB_IMPORTANT, "lcdserver: Missing argument to "
"-p/--port option");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-m") ||
Expand All @@ -86,7 +83,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT, "lcdserver: Missing argument to "
"-m/--startupmessage");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-t") ||
Expand All @@ -100,14 +97,14 @@ int main(int argc, char **argv)
if (message_time < 1 || message_time > 1000)
{
VERBOSE(VB_IMPORTANT, "lcdserver: Bad show message time");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else
{
VERBOSE(VB_IMPORTANT, "lcdserver: Missing argument to "
"-t/--messagetime");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-v") ||
Expand All @@ -117,14 +114,14 @@ int main(int argc, char **argv)
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

++argpos;
}
else
{
cerr << "Missing argument to -v/--verbose option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-l") ||
Expand All @@ -136,7 +133,7 @@ int main(int argc, char **argv)
if (logfile.startsWith("-"))
{
cerr << "Invalid or missing argument to -l/--logfile option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
Expand All @@ -146,7 +143,7 @@ int main(int argc, char **argv)
else
{
cerr << "Missing argument to -l/--logfile option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-x") ||
Expand All @@ -161,14 +158,14 @@ int main(int argc, char **argv)
if (debug_level < 0 || debug_level > 10)
{
VERBOSE(VB_IMPORTANT, "lcdserver: Bad debug level");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else
{
VERBOSE(VB_IMPORTANT, "lcdserver: Missing argument to "
"-x/--debuglevel");
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else
Expand All @@ -193,7 +190,7 @@ int main(int argc, char **argv)
<< endl <<
" [number between 0 and 10] (default 0)"
<< endl;
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -208,7 +205,7 @@ int main(int argc, char **argv)
if (logfd < 0)
{
perror("open(logfile)");
return FRONTEND_EXIT_OPENING_LOGFILE_ERROR;
return GENERIC_EXIT_PERMISSIONS_ERROR;
}
}

Expand All @@ -233,7 +230,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT, "lcdserver: Failed to run as a daemon. "
"Bailing out.");
return LCD_EXIT_DAEMONIZING_ERROR;
return GENERIC_EXIT_DAEMONIZING_ERROR;
}
cout << endl;
}
Expand All @@ -244,7 +241,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT, "lcdserver: Could not initialize MythContext. "
"Exiting.");
return FRONTEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

MythTranslation::load("mythfrontend");
Expand All @@ -263,6 +260,6 @@ int main(int argc, char **argv)
a.exec();

delete gContext;
return FRONTEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

6 changes: 3 additions & 3 deletions mythtv/programs/mythmessage/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main(int argc, char *argv[])
if (a.argc() == 0)
{
printHelp();
return MESSAGE_EXIT_OK;
return GENERIC_EXIT_OK;
}

for (int argpos = 1; argpos < a.argc(); ++argpos)
Expand All @@ -65,7 +65,7 @@ int main(int argc, char *argv[])
if (arg.startsWith("-h") || arg.startsWith("--help"))
{
printHelp();
return MESSAGE_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand Down Expand Up @@ -140,6 +140,6 @@ int main(int argc, char *argv[])

sock->deleteLater();

return MESSAGE_EXIT_OK;
return GENERIC_EXIT_OK;
}

22 changes: 11 additions & 11 deletions mythtv/programs/mythpreviewgen/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ int preview_helper(const QString &_chanid, const QString &starttime,
"Cannot locate recording made on '%1' at '%2'")
.arg(chanid).arg(starttime));
delete pginfo;
return PREVIEWGEN_EXIT_NOT_OK;
return GENERIC_EXIT_NOT_OK;
}
pginfo->SetPathname(pginfo->GetPlaybackURL(false, true));
}
Expand All @@ -121,7 +121,7 @@ int preview_helper(const QString &_chanid, const QString &starttime,
{
VERBOSE(VB_IMPORTANT, QString(
"Cannot read this file '%1'").arg(infile));
return PREVIEWGEN_EXIT_NOT_OK;
return GENERIC_EXIT_NOT_OK;
}
pginfo = new ProgramInfo(
infile, ""/*plot*/, ""/*title*/, ""/*subtitle*/, ""/*director*/,
Expand All @@ -131,7 +131,7 @@ int preview_helper(const QString &_chanid, const QString &starttime,
else
{
VERBOSE(VB_IMPORTANT, "Cannot locate recording to preview");
return PREVIEWGEN_EXIT_NOT_OK;
return GENERIC_EXIT_NOT_OK;
}

PreviewGenerator *previewgen = new PreviewGenerator(
Expand All @@ -150,7 +150,7 @@ int preview_helper(const QString &_chanid, const QString &starttime,

delete pginfo;

return (ok) ? PREVIEWGEN_EXIT_OK : PREVIEWGEN_EXIT_NOT_OK;
return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_NOT_OK;
}

int main(int argc, char **argv)
Expand All @@ -172,10 +172,10 @@ int main(int argc, char **argv)
if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
{
if (cmdline_err)
return PREVIEWGEN_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return PREVIEWGEN_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand All @@ -197,17 +197,17 @@ int main(int argc, char **argv)
if (cmdline.Parse(a.argc(), a.argv(), argpos, cmdline_err))
{
if (cmdline_err)
return PREVIEWGEN_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return PREVIEWGEN_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
cerr << "Invalid argument: " << a.argv()[argpos] << endl;
QByteArray help = cmdline.GetHelpString(true).toLocal8Bit();
cout << help.constData();
return PREVIEWGEN_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -216,7 +216,7 @@ int main(int argc, char **argv)
cerr << "--generate-preview must be accompanied by either " <<endl
<< "\nboth --chanid and --starttime parameters, " << endl
<< "\nor the --infile parameter." << endl;
return PREVIEWGEN_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

///////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -244,7 +244,7 @@ int main(int argc, char **argv)
if (!gContext->Init(false))
{
VERBOSE(VB_IMPORTANT, "Failed to init MythContext.");
return PREVIEWGEN_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}
gCoreContext->SetBackend(false); // TODO Required?

Expand Down
24 changes: 12 additions & 12 deletions mythtv/programs/mythshutdown/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,37 +231,37 @@ static int getStatus(bool bWantRecStatus)
if (isRunning("mythtranscode"))
{
VERBOSE(VB_IMPORTANT, "Transcoding in progress...");
res += 1;
res |= 1;
}

if (isRunning("mythcommflag"))
{
VERBOSE(VB_IMPORTANT, "Commercial Detection in progress...");
res += 2;
res |= 2;
}

if (isRunning("mythfilldatabas"))
if (isRunning("mythfilldatabase"))
{
VERBOSE(VB_IMPORTANT, "Grabbing EPG data in progress...");
res += 4;
res |= 4;
}

if (bWantRecStatus && isRecording())
{
VERBOSE(VB_IMPORTANT, "Recording in progress...");
res += 8;
res |= 8;
}

if (getGlobalSetting("MythShutdownLock", "0") != "0")
{
VERBOSE(VB_IMPORTANT, "Shutdown is locked");
res += 16;
res |= 16;
}

if (JobQueue::HasRunningOrPendingJobs(15))
{
VERBOSE(VB_IMPORTANT, "Has queued or pending jobs");
res += 32;
res |= 32;
}

QDateTime dtPeriod1Start = getDailyWakeupTime("DailyWakeupStartPeriod1");
Expand Down Expand Up @@ -805,13 +805,13 @@ int main(int argc, char **argv)
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
++argpos;
}
else
{
cerr << "Missing argument to -v/--verbose option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand Down Expand Up @@ -867,7 +867,7 @@ int main(int argc, char **argv)
{
cout << "mythshutdown: Missing argument to "
"-w/--setwakeup option" << endl;
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

bSetWakeupTime = true;
Expand Down Expand Up @@ -903,7 +903,7 @@ int main(int argc, char **argv)
{
cout << "Invalid argument: " << a.argv()[argpos] << endl;
showUsage();
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -913,7 +913,7 @@ int main(int argc, char **argv)
{
cout << "mythshutdown: Could not initialize MythContext. "
"Exiting." << endl;
return FRONTEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}


Expand Down
66 changes: 33 additions & 33 deletions mythtv/programs/mythtranscode/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -s/--starttime option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-c") ||
Expand All @@ -195,7 +195,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -c/--chanid option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos], "-j"))
Expand All @@ -208,7 +208,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -j option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-i") ||
Expand All @@ -224,7 +224,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -i/--infile option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"--video"))
Expand All @@ -246,7 +246,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -o/--outfile option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-V"))
Expand All @@ -259,7 +259,7 @@ int main(int argc, char *argv[])
else
{
cerr << "Missing argument to -V option\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-v") ||
Expand All @@ -269,13 +269,13 @@ int main(int argc, char *argv[])
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

++argpos;
} else
{
cerr << "Missing argument to -v/--verbose option\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-p") ||
Expand All @@ -290,7 +290,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -p/--profile option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-l") ||
Expand Down Expand Up @@ -326,7 +326,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -l/--honorcutlist option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"--inversecut"))
Expand All @@ -336,7 +336,7 @@ int main(int argc, char *argv[])
{
cerr << "--inversecut option can only be used with --infile\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (a.argc()-1 > argpos && a.argv()[argpos+1][0] != '-')
Expand Down Expand Up @@ -371,7 +371,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to --inversecut option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-k") ||
Expand All @@ -396,7 +396,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -f/--fifodir option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-ro") ||
Expand All @@ -411,7 +411,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -ro/--recorderOptions option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"--fifosync"))
Expand Down Expand Up @@ -443,7 +443,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing argument to -e/--ostream option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-O") ||
Expand All @@ -469,7 +469,7 @@ int main(int argc, char *argv[])
cerr << "Invalid or missing argument to -O/--override-setting "
"option\n";
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

++argpos;
Expand All @@ -478,13 +478,13 @@ int main(int argc, char *argv[])
!strcmp(a.argv()[argpos],"--help"))
{
usage(a.argv()[0]);
return TRANSCODE_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
cerr << "Unknown option: " << a.argv()[argpos] << endl;
usage(a.argv()[0]);
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -496,7 +496,7 @@ int main(int argc, char *argv[])
if (!gContext->Init(false))
{
VERBOSE(VB_IMPORTANT, "Failed to init MythContext, exiting.");
return TRANSCODE_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

gCoreContext->SetAppName(binname);
Expand Down Expand Up @@ -527,48 +527,48 @@ int main(int argc, char *argv[])
{
cerr << "mythtranscode: ERROR: Unable to find DB info for "
<< "JobQueue ID# " << jobID << endl;
return TRANSCODE_EXIT_NO_RECORDING_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}
}

if ((! found_infile && !(found_chanid && found_starttime)) ||
(found_infile && (found_chanid || found_starttime)) )
{
cerr << "Must specify -i OR -c AND -s options!\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
if (isVideo && !found_infile)
{
cerr << "Must specify --infile to use --video\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
if (jobID >= 0 && (found_infile || build_index))
{
cerr << "Can't specify -j with --buildindex, --video or --infile\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
if ((jobID >= 0) && build_index)
{
cerr << "Can't specify both -j and --buildindex\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
if (keyframesonly && !fifodir.isEmpty())
{
cerr << "Cannot specify both --fifodir and --allkeys\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
if (fifosync && fifodir.isEmpty())
{
cerr << "Must specify --fifodir to use --fifosync\n";
return TRANSCODE_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

VERBOSE(VB_IMPORTANT, QString("Enabled verbose msgs: %1").arg(verboseString));

if (!MSqlQuery::testDBConnection())
{
printf("couldn't open db\n");
return TRANSCODE_EXIT_DB_ERROR;
return GENERIC_EXIT_DB_ERROR;
}

ProgramInfo *pginfo = NULL;
Expand All @@ -590,7 +590,7 @@ int main(int argc, char *argv[])
.arg(chanid).arg(starttime);
cerr << msg.toLocal8Bit().constData() << endl;
delete pginfo;
return TRANSCODE_EXIT_NO_RECORDING_DATA;
return GENERIC_EXIT_NO_RECORDING_DATA;
}

infile = pginfo->GetPlaybackURL(false, true);
Expand All @@ -614,7 +614,7 @@ int main(int argc, char *argv[])
"Mythtranscode is currently unable to transcode remote "
"files.")
.arg(infile));
return TRANSCODE_EXIT_REMOTE_FILE;
return GENERIC_EXIT_REMOTE_FILE;
}

if (outfile.isNull() && !build_index)
Expand Down Expand Up @@ -644,7 +644,7 @@ int main(int argc, char *argv[])
JobQueue::ChangeJobArgs(jobID, "RENAME_TO_NUV");
}

int exitcode = TRANSCODE_EXIT_OK;
int exitcode = GENERIC_EXIT_OK;
if ((result == REENCODE_MPEG2TRANS) || mpeg2 || build_index)
{
void (*update_func)(float) = NULL;
Expand Down Expand Up @@ -707,15 +707,15 @@ int main(int argc, char *argv[])
JobQueue::ChangeJobStatus(jobID, JOB_RETRY);
VERBOSE(VB_GENERAL, QString("Transcoding %1 aborted because of "
"cutlist update").arg(infile));
exitcode = TRANSCODE_EXIT_ERROR_CUTLIST_UPDATE;
exitcode = GENERIC_EXIT_RESTART;
}
else if (result == REENCODE_STOPPED)
{
if (jobID >= 0)
JobQueue::ChangeJobStatus(jobID, JOB_ABORTING);
VERBOSE(VB_GENERAL, QString("Transcoding %1 stopped because of "
"stop command").arg(infile));
exitcode = TRANSCODE_EXIT_STOPPED;
exitcode = GENERIC_EXIT_KILLED;
}
else
{
Expand Down Expand Up @@ -1084,7 +1084,7 @@ static void CompleteJob(int jobID, ProgramInfo *pginfo, bool useCutlist,
if (status == JOB_ABORTING) // Stop command was sent
JobQueue::ChangeJobStatus(jobID, JOB_ABORTED, "Job Aborted");
else if (status != JOB_ERRORING) // Recoverable error
resultCode = TRANSCODE_EXIT_RESTART;
resultCode = GENERIC_EXIT_RESTART;
else // Unrecoverable error
JobQueue::ChangeJobStatus(jobID, JOB_ERRORED,
"Unrecoverable error");
Expand Down
28 changes: 14 additions & 14 deletions mythtv/programs/mythtranscode/mpeg2fix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1252,11 +1252,11 @@ int MPEG2fixup::GetFrame(AVPacket *pkt)
{
VERBOSE(MPF_IMPORTANT, "Found end of file without finding "
" any frames");
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;
}
MPEG2frame *tmpFrame = GetPoolFrame(&vFrame.last()->pkt);
if (tmpFrame == NULL)
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;
vFrame.append(tmpFrame);
real_file_end = true;
file_end = true;
Expand Down Expand Up @@ -1295,7 +1295,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt)

MPEG2frame *tmpFrame = GetPoolFrame(pkt);
if (tmpFrame == NULL)
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;
switch (inputFC->streams[pkt->stream_index]->codec->codec_type)
{

Expand All @@ -1318,7 +1318,7 @@ int MPEG2fixup::GetFrame(AVPacket *pkt)
default:
framePool.enqueue(tmpFrame);
av_free_packet(pkt);
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;
}
}
}
Expand Down Expand Up @@ -1865,11 +1865,11 @@ int MPEG2fixup::Start()
QByteArray ainfile = infile.toLocal8Bit();
if (! InitAV(ainfile.constData(), format, 0))
{
return (TRANSCODE_EXIT_UNKNOWN_ERROR);
return (GENERIC_EXIT_NOT_OK);
}

if (! FindStart())
return (TRANSCODE_EXIT_UNKNOWN_ERROR);
return (GENERIC_EXIT_NOT_OK);

av_init_packet(&pkt);

Expand Down Expand Up @@ -1979,7 +1979,7 @@ int MPEG2fixup::Start()
.arg(expectedvPTS)
.arg(expectedDTS)
.arg(ptsIncrement));
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;
}
//reorder frames in presentation order (to the next I/P frame)
Lreorder = ReorderDTStoPTS(&vFrame);
Expand Down Expand Up @@ -2058,7 +2058,7 @@ int MPEG2fixup::Start()
.arg(frame_count));
if(GetFrameTypeT(curFrame) != 'I')
if (ConvertToI(&Lreorder, frame_pos))
return TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR;
return GENERIC_EXIT_WRITE_FRAME_ERROR;
WriteFrame(QString("save%1.yuv").arg(frame_count),
curFrame);
}
Expand Down Expand Up @@ -2097,7 +2097,7 @@ int MPEG2fixup::Start()
(GetFrameTypeT(curFrame) == 'P')))
{
if (ConvertToI(&Lreorder, frame_pos))
return TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR;
return GENERIC_EXIT_WRITE_FRAME_ERROR;
ptsorder_eq_dtsorder = true;
}
else if (! new_discard_state &&
Expand Down Expand Up @@ -2202,7 +2202,7 @@ int MPEG2fixup::Start()
int ret = InsertFrame(GetFrameNum(vFrame.current()),
deltaPTS, ptsIncrement, 0);
if(ret < 0)
return TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR;
return GENERIC_EXIT_WRITE_FRAME_ERROR;
for (vFrame.at(frame_pos + Lreorder.count()); ret;
vFrame.next(), --ret)
{
Expand Down Expand Up @@ -2244,7 +2244,7 @@ int MPEG2fixup::Start()
.arg(PtsTime(vFrame.current()->pkt.dts))
.arg(vFrame.current()->pkt.pos));
if (AddFrame(vFrame.current()))
return TRANSCODE_BUGGY_EXIT_DEADLOCK;
return GENERIC_EXIT_DEADLOCK;

if (vFrame.current() == markedFrame)
{
Expand Down Expand Up @@ -2415,7 +2415,7 @@ int MPEG2fixup::Start()
.arg(PtsTime(af->current()->pkt.pts))
.arg(af->current()->pkt.pos));
if (AddFrame(af->current()))
return TRANSCODE_BUGGY_EXIT_DEADLOCK;
return GENERIC_EXIT_DEADLOCK;
framePool.enqueue(af->first());

af->remove();
Expand Down Expand Up @@ -2572,12 +2572,12 @@ int MPEG2fixup::BuildKeyframeIndex(QString &file,
/*============ initialise AV ===============*/
QByteArray fname = file.toLocal8Bit();
if (!InitAV(fname.constData(), NULL, 0))
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;

if (mkvfile)
{
VERBOSE(MPF_IMPORTANT, "Seek tables are not required for MKV");
return TRANSCODE_EXIT_UNKNOWN_ERROR;
return GENERIC_EXIT_NOT_OK;
}

av_init_packet(&pkt);
Expand Down
13 changes: 8 additions & 5 deletions mythtv/programs/mythtranscode/mpeg2fix.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,14 @@ class MPEG2fixup
cout << args << endl; \
} \
} while (0)
#define TRANSCODE_EXIT_OK 0
#define TRANSCODE_EXIT_UNKNOWN_ERROR -10
#define TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR -11
#define TRANSCODE_BUGGY_EXIT_DEADLOCK -12

// Be sure to keep these the same as in libmythbase/exitcodes.h or expect
// odd behavior eventually
#define GENERIC_EXIT_OK 0
#define GENERIC_EXIT_NOT_OK 128
#define GENERIC_EXIT_WRITE_FRAME_ERROR 149
#define GENERIC_EXIT_DEADLOCK 150
#else
#include "mythcontext.h"
#include "exitcodes.h"
#include "mythcontext.h"
#endif
50 changes: 25 additions & 25 deletions mythtv/programs/mythtv-setup/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static int reloadTheme(void)
{
VERBOSE(VB_IMPORTANT, QString("Couldn't find theme '%1'")
.arg(themename));
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

MythTranslation::reload();
Expand All @@ -183,7 +183,7 @@ static int reloadTheme(void)
GetMythMainWindow()->SetEffectsEnabled(true);

if (!RunMenu(themedir, themename) && !resetTheme(themedir, themename))
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;

return 0;
}
Expand Down Expand Up @@ -317,15 +317,15 @@ int main(int argc, char *argv[])
if (display.startsWith("-"))
{
cerr << "Invalid or missing argument to -display option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
++argpos;
}
else
{
cerr << "Missing argument to -display option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-geometry") ||
Expand All @@ -338,15 +338,15 @@ int main(int argc, char *argv[])
{
cerr << "Invalid or missing argument to "
"-geometry option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
++argpos;
}
else
{
cerr << "Missing argument to -geometry option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-l") ||
Expand All @@ -359,7 +359,7 @@ int main(int argc, char *argv[])
{
cerr << "Invalid or missing argument"
" to -l/--logfile option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
Expand All @@ -369,7 +369,7 @@ int main(int argc, char *argv[])
else
{
cerr << "Missing argument to -l/--logfile option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-v") ||
Expand All @@ -379,13 +379,13 @@ int main(int argc, char *argv[])
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
++argpos;
}
else
{
cerr << "Missing argument to -v/--verbose option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-O") ||
Expand All @@ -398,7 +398,7 @@ int main(int argc, char *argv[])
{
cerr << "Invalid or missing argument to "
"-O/--override-setting option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

QStringList pairs = tmpArg.split(",");
Expand All @@ -416,7 +416,7 @@ int main(int argc, char *argv[])
{
cerr << "Invalid or missing argument to "
"-O/--override-setting option\n";
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

++argpos;
Expand Down Expand Up @@ -465,7 +465,7 @@ int main(int argc, char *argv[])
{
cerr << "Missing scan number for import, please run "
<< "--scan-list to list importable scans." << endl;
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"--scan-save-only"))
Expand Down Expand Up @@ -500,7 +500,7 @@ int main(int argc, char *argv[])
{
cerr << "Invalid argument: " << a.argv()[argpos] << endl;
print_usage();
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand Down Expand Up @@ -593,7 +593,7 @@ int main(int argc, char *argv[])
{
cerr << "But no cards have been defined on this host"
<< endl;
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
cerr << "Valid cards: " << endl;
for (uint i = 0; i < cardids.size(); i++)
Expand All @@ -605,7 +605,7 @@ int main(int argc, char *argv[])
CardUtil::GetVideoDevice(cardids[i])
.toAscii().constData());
}
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}

if (!okInputName)
Expand All @@ -617,7 +617,7 @@ int main(int argc, char *argv[])
{
cerr << inputnames[i].toAscii().constData() << endl;
}
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -632,7 +632,7 @@ int main(int argc, char *argv[])
<< scanTableName.toLocal8Bit().constData() << endl
<< "Please make sure it is in the format freq_std-"
"modulation-country." << endl;
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
QString freq_std = scanTableName.mid(0, firstBreak).toLower();
QString mod = scanTableName.mid(
Expand Down Expand Up @@ -662,7 +662,7 @@ int main(int argc, char *argv[])
startChan, freq_std, mod, tbl);
ret = a.exec();
}
return (ret) ? GENERIC_EXIT_NOT_OK : BACKEND_EXIT_OK;
return (ret) ? GENERIC_EXIT_NOT_OK : GENERIC_EXIT_OK;
}

if (doScanList)
Expand All @@ -679,7 +679,7 @@ int main(int argc, char *argv[])
}
cout<<endl;

return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

if (scanImport)
Expand All @@ -693,7 +693,7 @@ int main(int argc, char *argv[])
ci.Process(list);
}
cout<<"*** SCAN IMPORT END ***"<<endl;
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}

MythTranslation::load("mythfrontend");
Expand All @@ -704,7 +704,7 @@ int main(int argc, char *argv[])
{
VERBOSE(VB_IMPORTANT, QString("Couldn't find theme '%1'")
.arg(themename));
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

MythMainWindow *mainWindow = GetMythMainWindow();
Expand All @@ -717,7 +717,7 @@ int main(int argc, char *argv[])
if (LanguageSelection::prompt())
{
if (!reloadTheme())
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;
}

if (!UpgradeTVDatabaseSchema(true))
Expand All @@ -736,7 +736,7 @@ int main(int argc, char *argv[])

// Let the user select buttons, type values, scan for channels, etc.
if (!RunMenu(themedir, themename) && !resetTheme(themedir, themename))
return FRONTEND_BUGGY_EXIT_NO_THEME;
return GENERIC_EXIT_NO_THEME;

ExpertSettingsEditor *expertEditor = NULL;
if (expertMode)
Expand All @@ -752,7 +752,7 @@ int main(int argc, char *argv[])
expertEditor = NULL;
VERBOSE(VB_IMPORTANT, "Unable to create expert settings editor "
"window");
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand Down
20 changes: 10 additions & 10 deletions mythtv/programs/mythwelcome/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ int main(int argc, char **argv)
if (cmdline.PreParse(argc, argv, argpos, cmdline_err))
{
if (cmdline_err)
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
}

Expand All @@ -107,14 +107,14 @@ int main(int argc, char **argv)
{
if (parse_verbose_arg(a.argv()[argpos+1]) ==
GENERIC_EXIT_INVALID_CMDLINE)
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

++argpos;
}
else
{
cerr << "Missing argument to -v/--verbose option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (!strcmp(a.argv()[argpos],"-s") ||
Expand All @@ -131,7 +131,7 @@ int main(int argc, char **argv)
if (logfile.startsWith("-"))
{
cerr << "Invalid or missing argument to -l/--logfile option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
else
{
Expand All @@ -141,21 +141,21 @@ int main(int argc, char **argv)
else
{
cerr << "Missing argument to -l/--logfile option\n";
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}
else if (cmdline.Parse(a.argc(), a.argv(), argpos, cmdline_err))
{
if (cmdline_err)
return BACKEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;

if (cmdline.WantsToExit())
return BACKEND_EXIT_OK;
return GENERIC_EXIT_OK;
}
else
{
showUsage(cmdline);
return FRONTEND_EXIT_INVALID_CMDLINE;
return GENERIC_EXIT_INVALID_CMDLINE;
}
}

Expand All @@ -164,7 +164,7 @@ int main(int argc, char **argv)
{
VERBOSE(VB_IMPORTANT, "mythwelcome: Could not initialize MythContext. "
"Exiting.");
return FRONTEND_EXIT_NO_MYTHCONTEXT;
return GENERIC_EXIT_NO_MYTHCONTEXT;
}

gCoreContext->SetAppName(binname);
Expand Down