218 changes: 109 additions & 109 deletions mythtv/libs/libmyth/programtypes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,25 @@ QString toString(MarkTypes type)
return "unknown";
}

QString toUIState(RecStatusType recstatus)
QString RecStatus::toUIState(RecStatus::Type recstatus)
{
if (recstatus == rsRecorded || recstatus == rsWillRecord)
if (recstatus == RecStatus::Recorded || recstatus == RecStatus::WillRecord)
return "normal";

if (recstatus == rsRecording || recstatus == rsTuning)
if (recstatus == RecStatus::Recording || recstatus == RecStatus::Tuning)
return "running";

if (recstatus == rsConflict || recstatus == rsOffLine ||
recstatus == rsTunerBusy || recstatus == rsFailed ||
recstatus == rsAborted || recstatus == rsMissed ||
recstatus == rsFailing)
if (recstatus == RecStatus::Conflict || recstatus == RecStatus::Offline ||
recstatus == RecStatus::TunerBusy || recstatus == RecStatus::Failed ||
recstatus == RecStatus::Aborted || recstatus == RecStatus::Missed ||
recstatus == RecStatus::Failing)
{
return "error";
}

if (recstatus == rsRepeat ||
recstatus == rsNeverRecord || recstatus == rsDontRecord ||
(recstatus != rsDontRecord && recstatus <= rsEarlierShowing))
if (recstatus == RecStatus::Repeat ||
recstatus == RecStatus::NeverRecord || recstatus == RecStatus::DontRecord ||
(recstatus != RecStatus::DontRecord && recstatus <= RecStatus::EarlierShowing))
{
return "disabled";
}
Expand All @@ -82,202 +82,202 @@ QString toUIState(RecStatusType recstatus)
}

/// \brief Converts "recstatus" into a short (unreadable) string.
QString toString(RecStatusType recstatus, uint id)
QString RecStatus::toString(RecStatus::Type recstatus, uint id)
{
QString ret = "-";
switch (recstatus)
{
case rsAborted:
ret = QObject::tr("A", "RecStatusChar rsAborted");
case RecStatus::Aborted:
ret = QObject::tr("A", "RecStatusChar RecStatus::Aborted");
break;
case rsRecorded:
ret = QObject::tr("R", "RecStatusChar rsRecorded");
case RecStatus::Recorded:
ret = QObject::tr("R", "RecStatusChar RecStatus::Recorded");
break;
case rsRecording:
case RecStatus::Recording:
ret = QString::number(id);
break;
case rsTuning:
case RecStatus::Tuning:
ret = QString::number(id);
break;
case rsFailing:
case RecStatus::Failing:
ret = QString::number(id);
break;
case rsWillRecord:
case RecStatus::WillRecord:
ret = QString::number(id);
break;
case rsDontRecord:
ret = QObject::tr("X", "RecStatusChar rsDontRecord");
case RecStatus::DontRecord:
ret = QObject::tr("X", "RecStatusChar RecStatus::DontRecord");
break;
case rsPreviousRecording:
ret = QObject::tr("P", "RecStatusChar rsPreviousRecording");
case RecStatus::PreviousRecording:
ret = QObject::tr("P", "RecStatusChar RecStatus::PreviousRecording");
break;
case rsCurrentRecording:
ret = QObject::tr("R", "RecStatusChar rsCurrentRecording");
case RecStatus::CurrentRecording:
ret = QObject::tr("R", "RecStatusChar RecStatus::CurrentRecording");
break;
case rsEarlierShowing:
ret = QObject::tr("E", "RecStatusChar rsEarlierShowing");
case RecStatus::EarlierShowing:
ret = QObject::tr("E", "RecStatusChar RecStatus::EarlierShowing");
break;
case rsTooManyRecordings:
ret = QObject::tr("T", "RecStatusChar rsTooManyRecordings");
case RecStatus::TooManyRecordings:
ret = QObject::tr("T", "RecStatusChar RecStatus::TooManyRecordings");
break;
case rsCancelled:
ret = QObject::tr("c", "RecStatusChar rsCancelled");
case RecStatus::Cancelled:
ret = QObject::tr("c", "RecStatusChar RecStatus::Cancelled");
break;
case rsMissedFuture:
case rsMissed:
ret = QObject::tr("M", "RecStatusChar rsMissed");
case RecStatus::MissedFuture:
case RecStatus::Missed:
ret = QObject::tr("M", "RecStatusChar RecStatus::Missed");
break;
case rsConflict:
ret = QObject::tr("C", "RecStatusChar rsConflict");
case RecStatus::Conflict:
ret = QObject::tr("C", "RecStatusChar RecStatus::Conflict");
break;
case rsLaterShowing:
ret = QObject::tr("L", "RecStatusChar rsLaterShowing");
case RecStatus::LaterShowing:
ret = QObject::tr("L", "RecStatusChar RecStatus::LaterShowing");
break;
case rsRepeat:
ret = QObject::tr("r", "RecStatusChar rsRepeat");
case RecStatus::Repeat:
ret = QObject::tr("r", "RecStatusChar RecStatus::Repeat");
break;
case rsInactive:
ret = QObject::tr("x", "RecStatusChar rsInactive");
case RecStatus::Inactive:
ret = QObject::tr("x", "RecStatusChar RecStatus::Inactive");
break;
case rsLowDiskSpace:
ret = QObject::tr("K", "RecStatusChar rsLowDiskSpace");
case RecStatus::LowDiskSpace:
ret = QObject::tr("K", "RecStatusChar RecStatus::LowDiskSpace");
break;
case rsTunerBusy:
ret = QObject::tr("B", "RecStatusChar rsTunerBusy");
case RecStatus::TunerBusy:
ret = QObject::tr("B", "RecStatusChar RecStatus::TunerBusy");
break;
case rsFailed:
ret = QObject::tr("f", "RecStatusChar rsFailed");
case RecStatus::Failed:
ret = QObject::tr("f", "RecStatusChar RecStatus::Failed");
break;
case rsNotListed:
ret = QObject::tr("N", "RecStatusChar rsNotListed");
case RecStatus::NotListed:
ret = QObject::tr("N", "RecStatusChar RecStatus::NotListed");
break;
case rsNeverRecord:
ret = QObject::tr("V", "RecStatusChar rsNeverRecord");
case RecStatus::NeverRecord:
ret = QObject::tr("V", "RecStatusChar RecStatus::NeverRecord");
break;
case rsOffLine:
ret = QObject::tr("F", "RecStatusChar rsOffLine");
case RecStatus::Offline:
ret = QObject::tr("F", "RecStatusChar RecStatus::Offline");
break;
case rsUnknown:
case RecStatus::Unknown:
break;
}

return (ret.isEmpty()) ? QString("-") : ret;
}

/// \brief Converts "recstatus" into a human readable string
QString toString(RecStatusType recstatus, RecordingType rectype)
QString RecStatus::toString(RecStatus::Type recstatus, RecordingType rectype)
{
if (recstatus == rsUnknown && rectype == kNotRecording)
if (recstatus == RecStatus::Unknown && rectype == kNotRecording)
return QObject::tr("Not Recording");

switch (recstatus)
{
case rsAborted:
case RecStatus::Aborted:
return QObject::tr("Aborted");
case rsRecorded:
case RecStatus::Recorded:
return QObject::tr("Recorded");
case rsRecording:
case RecStatus::Recording:
return QObject::tr("Recording");
case rsTuning:
case RecStatus::Tuning:
return QObject::tr("Tuning");
case rsFailing:
case RecStatus::Failing:
return QObject::tr("Failing");
case rsWillRecord:
case RecStatus::WillRecord:
return QObject::tr("Will Record");
case rsDontRecord:
case RecStatus::DontRecord:
return QObject::tr("Don't Record");
case rsPreviousRecording:
case RecStatus::PreviousRecording:
return QObject::tr("Previously Recorded");
case rsCurrentRecording:
case RecStatus::CurrentRecording:
return QObject::tr("Currently Recorded");
case rsEarlierShowing:
case RecStatus::EarlierShowing:
return QObject::tr("Earlier Showing");
case rsTooManyRecordings:
case RecStatus::TooManyRecordings:
return QObject::tr("Max Recordings");
case rsCancelled:
case RecStatus::Cancelled:
return QObject::tr("Manual Cancel");
case rsMissedFuture:
case rsMissed:
case RecStatus::MissedFuture:
case RecStatus::Missed:
return QObject::tr("Missed");
case rsConflict:
case RecStatus::Conflict:
return QObject::tr("Conflicting");
case rsLaterShowing:
case RecStatus::LaterShowing:
return QObject::tr("Later Showing");
case rsRepeat:
case RecStatus::Repeat:
return QObject::tr("Repeat");
case rsInactive:
case RecStatus::Inactive:
return QObject::tr("Inactive");
case rsLowDiskSpace:
case RecStatus::LowDiskSpace:
return QObject::tr("Low Disk Space");
case rsTunerBusy:
case RecStatus::TunerBusy:
return QObject::tr("Tuner Busy");
case rsFailed:
case RecStatus::Failed:
return QObject::tr("Recorder Failed");
case rsNotListed:
case RecStatus::NotListed:
return QObject::tr("Not Listed");
case rsNeverRecord:
case RecStatus::NeverRecord:
return QObject::tr("Never Record");
case rsOffLine:
case RecStatus::Offline:
return QObject::tr("Recorder Off-Line");
case rsUnknown:
case RecStatus::Unknown:
return QObject::tr("Unknown");
}

return QObject::tr("Unknown");
}

/// \brief Converts "recstatus" into a long human readable description.
QString toDescription(RecStatusType recstatus, RecordingType rectype,
QString RecStatus::toDescription(RecStatus::Type recstatus, RecordingType rectype,
const QDateTime &recstartts)
{
if (recstatus == rsUnknown && rectype == kNotRecording)
if (recstatus == RecStatus::Unknown && rectype == kNotRecording)
return QObject::tr("This showing is not scheduled to record");

QString message;
QDateTime now = MythDate::current();

if (recstatus <= rsWillRecord)
if (recstatus <= RecStatus::WillRecord)
{
switch (recstatus)
{
case rsWillRecord:
case RecStatus::WillRecord:
message = QObject::tr("This showing will be recorded.");
break;
case rsRecording:
case RecStatus::Recording:
message = QObject::tr("This showing is being recorded.");
break;
case rsTuning:
case RecStatus::Tuning:
message = QObject::tr("The showing is being tuned.");
break;
case rsFailing:
case RecStatus::Failing:
message = QObject::tr("The showing is failing to record "
"because of errors.");
break;
case rsRecorded:
case RecStatus::Recorded:
message = QObject::tr("This showing was recorded.");
break;
case rsAborted:
case RecStatus::Aborted:
message = QObject::tr("This showing was recorded but was "
"aborted before completion.");
break;
case rsMissed:
case rsMissedFuture:
case RecStatus::Missed:
case RecStatus::MissedFuture:
message = QObject::tr("This showing was not recorded because "
"the master backend was not running.");
break;
case rsCancelled:
case RecStatus::Cancelled:
message = QObject::tr("This showing was not recorded because "
"it was manually cancelled.");
break;
case rsLowDiskSpace:
case RecStatus::LowDiskSpace:
message = QObject::tr("This showing was not recorded because "
"there wasn't enough disk space.");
break;
case rsTunerBusy:
case RecStatus::TunerBusy:
message = QObject::tr("This showing was not recorded because "
"the recorder was already in use.");
break;
case rsFailed:
case RecStatus::Failed:
message = QObject::tr("This showing was not recorded because "
"the recorder failed.");
break;
Expand All @@ -296,49 +296,49 @@ QString toDescription(RecStatusType recstatus, RecordingType rectype,

switch (recstatus)
{
case rsDontRecord:
case RecStatus::DontRecord:
message += QObject::tr("it was manually set to not record.");
break;
case rsPreviousRecording:
case RecStatus::PreviousRecording:
message += QObject::tr("this episode was previously recorded "
"according to the duplicate policy chosen "
"for this title.");
break;
case rsCurrentRecording:
case RecStatus::CurrentRecording:
message += QObject::tr("this episode was previously recorded and "
"is still available in the list of "
"recordings.");
break;
case rsEarlierShowing:
case RecStatus::EarlierShowing:
message += QObject::tr("this episode will be recorded at an "
"earlier time instead.");
break;
case rsTooManyRecordings:
case RecStatus::TooManyRecordings:
message += QObject::tr("too many recordings of this program have "
"already been recorded.");
break;
case rsConflict:
case RecStatus::Conflict:
message += QObject::tr("another program with a higher priority "
"will be recorded.");
break;
case rsLaterShowing:
case RecStatus::LaterShowing:
message += QObject::tr("this episode will be recorded at a "
"later time instead.");
break;
case rsRepeat:
case RecStatus::Repeat:
message += QObject::tr("this episode is a repeat.");
break;
case rsInactive:
case RecStatus::Inactive:
message += QObject::tr("this recording rule is inactive.");
break;
case rsNotListed:
case RecStatus::NotListed:
message += QObject::tr("this rule does not match any showings in "
"the current program listings.");
break;
case rsNeverRecord:
case RecStatus::NeverRecord:
message += QObject::tr("it was marked to never be recorded.");
break;
case rsOffLine:
case RecStatus::Offline:
message += QObject::tr("the required recorder is off-line.");
break;
default:
Expand Down
80 changes: 45 additions & 35 deletions mythtv/libs/libmyth/programtypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <QString>
#include <QMap>
#include <QHash>
#include <QtCore>

// MythTV headers
#include "mythexp.h" // for MPUBLIC
Expand Down Expand Up @@ -206,41 +207,50 @@ typedef enum SubtitleTypes {
#define kSubtitlePropertyOffset (kAudioPropertyBits+kVideoPropertyBits)
#define kSubtitlePropertyMask (0x0f<<kSubtitlePropertyOffset)

typedef enum RecStatusTypes {
rsFailing = -14,
//rsOtherRecording = -13, (obsolete)
//rsOtherTuning = -12, (obsolete)
rsMissedFuture = -11,
rsTuning = -10,
rsFailed = -9,
rsTunerBusy = -8,
rsLowDiskSpace = -7,
rsCancelled = -6,
rsMissed = -5,
rsAborted = -4,
rsRecorded = -3,
rsRecording = -2,
rsWillRecord = -1,
rsUnknown = 0,
rsDontRecord = 1,
rsPreviousRecording = 2,
rsCurrentRecording = 3,
rsEarlierShowing = 4,
rsTooManyRecordings = 5,
rsNotListed = 6,
rsConflict = 7,
rsLaterShowing = 8,
rsRepeat = 9,
rsInactive = 10,
rsNeverRecord = 11,
rsOffLine = 12
//rsOtherShowing = 13 (obsolete)
} RecStatusType; // note stored in int8_t in ProgramInfo
MPUBLIC QString toUIState(RecStatusType);
MPUBLIC QString toString(RecStatusType, uint id);
MPUBLIC QString toString(RecStatusType, RecordingType type = kNotRecording);
MPUBLIC QString toDescription(RecStatusType, RecordingType,
const QDateTime &recstartts);
class MPUBLIC RecStatus
{
Q_GADGET

public:
Q_ENUMS(Type)

enum Type {
Failing = -14,
//OtherRecording = -13, (obsolete)
//OtherTuning = -12, (obsolete)
MissedFuture = -11,
Tuning = -10,
Failed = -9,
TunerBusy = -8,
LowDiskSpace = -7,
Cancelled = -6,
Missed = -5,
Aborted = -4,
Recorded = -3,
Recording = -2,
WillRecord = -1,
Unknown = 0,
DontRecord = 1,
PreviousRecording = 2,
CurrentRecording = 3,
EarlierShowing = 4,
TooManyRecordings = 5,
NotListed = 6,
Conflict = 7,
LaterShowing = 8,
Repeat = 9,
Inactive = 10,
NeverRecord = 11,
Offline = 12
//OtherShowing = 13 (obsolete)
}; // note stored in int8_t in ProgramInfo

static QString toUIState(Type);
static QString toString(Type, uint id);
static QString toString(Type, RecordingType type = kNotRecording);
static QString toDescription(Type, RecordingType,
const QDateTime &recstartts);
};

typedef enum AvailableStatusTypes {
asAvailable = 0,
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmyth/remoteutil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,12 @@ vector<ProgramInfo *> *RemoteGetCurrentlyRecordingList(void)
ProgramInfo *p = NULL;
vector<ProgramInfo *>::iterator it = info->begin();
// make sure whatever RemoteGetRecordingList() returned
// only has rsRecording shows
// only has RecStatus::Recording shows
for ( ; it != info->end(); ++it)
{
p = *it;
if (p->GetRecordingStatus() == rsRecording ||
(p->GetRecordingStatus() == rsRecorded &&
if (p->GetRecordingStatus() == RecStatus::Recording ||
(p->GetRecordingStatus() == RecStatus::Recorded &&
p->GetRecordingGroup() == "LiveTV"))
{
reclist->push_back(new ProgramInfo(*p));
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmyth/test/test_programinfo/test_programinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TestProgramInfo : public QObject
(uint) 0, /* part number */
(uint) 0, /* part total */
QDate(), /* original air date */
rsUnknown, /* rec status */
RecStatus::Unknown, /* rec status */
(uint) -1, /* record id */
kNotRecording, /* rec type */
(uint) -1, /* find id */
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythscheduler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class MythScheduler
// the list, followed by ProgramInfo's serialized
// to string lists.
virtual void GetAllPending(QStringList &strList) const = 0;
// Returns all the pending recording with a rsRecording, rsTuning
// or rsFailing status (i.e. currently attempting to record.)
// Returns all the pending recording with a RecStatus::Recording, RecStatus::Tuning
// or RecStatus::Failing status (i.e. currently attempting to record.)
virtual QMap<QString,ProgramInfo*> GetRecording(void) const = 0;
};

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/mythversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/// Update this whenever the plug-in ABI changes.
/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
/// libmythui class methods in exported headers.
#define MYTH_BINARY_VERSION "0.28.20150224-1"
#define MYTH_BINARY_VERSION "0.28.20150304-1"

/** \brief Increment this whenever the MythTV network protocol changes.
*
Expand Down
33 changes: 12 additions & 21 deletions mythtv/libs/libmythservicecontracts/datacontracts/recording.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
Q_CLASSINFO( "version", "1.02" );

Q_PROPERTY( uint RecordedId READ RecordedId WRITE setRecordedId )
Q_PROPERTY( int Status READ Status WRITE setStatus )
Q_PROPERTY( RecStatus::Type Status READ Status WRITE setStatus )
Q_PROPERTY( int Priority READ Priority WRITE setPriority )
Q_PROPERTY( QDateTime StartTs READ StartTs WRITE setStartTs )
Q_PROPERTY( QDateTime EndTs READ EndTs WRITE setEndTs )
Expand All @@ -43,17 +43,8 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
Q_PROPERTY( QString EncoderName READ EncoderName WRITE setEncoderName DESIGNABLE SerializeDetails )
Q_PROPERTY( QString Profile READ Profile WRITE setProfile DESIGNABLE SerializeDetails )

/*
Not using since Q_ENUMS seem to require the enum be defined in this class
Q_ENUMS( RecStatusType )
Q_ENUMS( RecordingType )
Q_ENUMS( RecordingDupInType )
Q_ENUMS( RecordingDupMethodType )
*/

PROPERTYIMP ( uint , RecordedId )
PROPERTYIMP_ENUM( RecStatusType , Status )
PROPERTYIMP_ENUM( RecStatus::Type , Status )
PROPERTYIMP ( int , Priority )
PROPERTYIMP ( QDateTime , StartTs )
PROPERTYIMP ( QDateTime , EndTs )
Expand All @@ -79,16 +70,16 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
public:

RecordingInfo(QObject *parent = 0)
: QObject ( parent ),
m_RecordedId ( 0 ),
m_Status ( rsUnknown ),
m_Priority ( 0 ),
m_RecordId ( 0 ),
m_RecType ( kNotRecording ),
m_DupInType ( kDupsInRecorded ),
m_DupMethod ( kDupCheckNone ),
m_EncoderId ( 0 ),
m_SerializeDetails( true )
: QObject ( parent ),
m_RecordedId ( 0 ),
m_Status ( RecStatus::Unknown ),
m_Priority ( 0 ),
m_RecordId ( 0 ),
m_RecType ( kNotRecording ),
m_DupInType ( kDupsInRecorded ),
m_DupMethod ( kDupCheckNone ),
m_EncoderId ( 0 ),
m_SerializeDetails( true )
{
}

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/recorders/dtvrecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,16 +663,16 @@ void DTVRecorder::HandleTimestamps(int stream_id, int64_t pts, int64_t dts)
LOG(VB_RECORD, LOG_DEBUG, LOC + QString("Inserted gap %1 dur %2")
.arg(recordingGaps.back().toString()).arg(diff/90000.0));

if (curRecording && curRecording->GetRecordingStatus() != rsFailing)
if (curRecording && curRecording->GetRecordingStatus() != RecStatus::Failing)
{
RecordingQuality recq(curRecording, recordingGaps);
if (recq.IsDamaged())
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("HandleTimestamps: too much damage, "
"setting status to %1")
.arg(toString(rsFailing, kSingleRecord)));
SetRecordingStatus(rsFailing, __FILE__, __LINE__);
.arg(RecStatus::toString(RecStatus::Failing, kSingleRecord)));
SetRecordingStatus(RecStatus::Failing, __FILE__, __LINE__);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/recorders/mpegrecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1073,14 +1073,14 @@ void MpegRecorder::run(void)
{
/* Already processing a gap, which means
* restarting the encoding didn't work! */
SetRecordingStatus(rsFailing, __FILE__, __LINE__);
SetRecordingStatus(RecStatus::Failing, __FILE__, __LINE__);
}
else
gap = true;
}

if (!RestartEncoding())
SetRecordingStatus(rsFailing, __FILE__, __LINE__);
SetRecordingStatus(RecStatus::Failing, __FILE__, __LINE__);
}
else if (_device_read_buffer->IsEOF() &&
IsRecordingRequested())
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/recorders/recorderbase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,19 +384,19 @@ void RecorderBase::CheckForRingBufferSwitch(void)
tvrec->RingBufferChanged(ringBuffer, curRecording, recq);
}

void RecorderBase::SetRecordingStatus(RecStatusType status,
void RecorderBase::SetRecordingStatus(RecStatus::Type status,
const QString& file, int line)
{
if (curRecording && curRecording->GetRecordingStatus() != status)
{
LOG(VB_RECORD, LOG_INFO,
QString("Modifying recording status from %1 to %2 at %3:%4")
.arg(toString(curRecording->GetRecordingStatus(), kSingleRecord))
.arg(toString(status, kSingleRecord)).arg(file).arg(line));
.arg(RecStatus::toString(curRecording->GetRecordingStatus(), kSingleRecord))
.arg(RecStatus::toString(status, kSingleRecord)).arg(file).arg(line));

curRecording->SetRecordingStatus(status);

if (status == rsFailing)
if (status == RecStatus::Failing)
{
curRecording->SaveVideoProperties(VID_DAMAGED, VID_DAMAGED);
SendMythSystemRecEvent("REC_FAILING", curRecording);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/recorderbase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class MTV_PUBLIC RecorderBase : public QRunnable
virtual bool PauseAndWait(int timeout = 100);

virtual void ResetForNewFile(void) = 0;
virtual void SetRecordingStatus(RecStatusType status,
virtual void SetRecordingStatus(RecStatus::Type status,
const QString& file, int line);
virtual void ClearStatistics(void);
virtual void FinishRecording(void);
Expand Down
36 changes: 18 additions & 18 deletions mythtv/libs/libmythtv/recordinginfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ RecordingInfo::RecordingInfo(

bool _repeat,

RecStatusType _oldrecstatus,
RecStatus::Type _oldrecstatus,
bool _reactivate,

uint _recordid,
Expand Down Expand Up @@ -114,7 +114,7 @@ RecordingInfo::RecordingInfo(
_startts, _endts, _recstartts, _recendts,
_seriesid, _programid, _inetref),
oldrecstatus(_oldrecstatus),
savedrecstatus(rsUnknown),
savedrecstatus(RecStatus::Unknown),
future(_future),
schedorder(_schedorder),
mplexid(_mplexid),
Expand Down Expand Up @@ -199,7 +199,7 @@ RecordingInfo::RecordingInfo(
const QDateTime &_recstartts,
const QDateTime &_recendts,

RecStatusType _recstatus,
RecStatus::Type _recstatus,

uint _recordid,
RecordingType _rectype,
Expand All @@ -215,8 +215,8 @@ RecordingInfo::RecordingInfo(
QString(), _recgroup, _playgroup,
_startts, _endts, _recstartts, _recendts,
_seriesid, _programid, _inetref),
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand Down Expand Up @@ -253,8 +253,8 @@ RecordingInfo::RecordingInfo(
RecordingInfo::RecordingInfo(
uint _chanid, const QDateTime &desiredts,
bool genUnknown, uint maxHours, LoadStatus *status) :
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand Down Expand Up @@ -440,8 +440,8 @@ void RecordingInfo::clone(const ProgramInfo &other,
record = NULL;
}

oldrecstatus = rsUnknown;
savedrecstatus = rsUnknown;
oldrecstatus = RecStatus::Unknown;
savedrecstatus = RecStatus::Unknown;
future = false;
schedorder = 0;
mplexid = 0;
Expand All @@ -460,8 +460,8 @@ void RecordingInfo::clear(void)
delete record;
record = NULL;

oldrecstatus = rsUnknown;
savedrecstatus = rsUnknown;
oldrecstatus = RecStatus::Unknown;
savedrecstatus = RecStatus::Unknown;
future = false;
schedorder = 0;
mplexid = 0;
Expand Down Expand Up @@ -869,11 +869,11 @@ void RecordingInfo::ApplyTranscoderProfileChange(const QString &profile) const

/**
* \brief Set this program to never be recorded by inserting 'history' for
* it into the database with a status of rsNeverRecord
* it into the database with a status of RecStatus::NeverRecord
*/
void RecordingInfo::ApplyNeverRecord(void)
{
SetRecordingStatus(rsNeverRecord);
SetRecordingStatus(RecStatus::NeverRecord);
SetScheduledStartTime(MythDate::current());
SetScheduledEndTime(GetRecordingStartTime());
AddHistory(true, true);
Expand Down Expand Up @@ -1172,7 +1172,7 @@ void RecordingInfo::FinishedRecording(bool allowReRecord)
GetProgramRecordingStatus();
if (!allowReRecord)
{
recstatus = rsRecorded;
recstatus = RecStatus::Recorded;

uint starttime = recstartts.toTime_t();
uint endtime = recendts.toTime_t();
Expand Down Expand Up @@ -1240,9 +1240,9 @@ void RecordingInfo::ReactivateRecording(void)
*/
void RecordingInfo::AddHistory(bool resched, bool forcedup, bool future)
{
bool dup = (GetRecordingStatus() == rsRecorded || forcedup);
RecStatusType rs = (GetRecordingStatus() == rsCurrentRecording &&
!future) ? rsPreviousRecording : GetRecordingStatus();
bool dup = (GetRecordingStatus() == RecStatus::Recorded || forcedup);
RecStatus::Type rs = (GetRecordingStatus() == RecStatus::CurrentRecording &&
!future) ? RecStatus::PreviousRecording : GetRecordingStatus();
LOG(VB_SCHEDULE, LOG_INFO, QString("AddHistory: %1/%2, %3, %4, %5/%6")
.arg(int(rs)).arg(int(oldrecstatus)).arg(future).arg(dup)
.arg(GetScheduledStartTime(MythDate::ISODate)).arg(GetTitle()));
Expand Down Expand Up @@ -1498,7 +1498,7 @@ void RecordingInfo::ForgetHistory(void)
// Remove any never records which aren't need anymore.
result.prepare("DELETE FROM oldrecorded "
"WHERE recstatus = :NEVER AND duplicate = 0");
result.bindValue(":NEVER", rsNeverRecord);
result.bindValue(":NEVER", RecStatus::NeverRecord);

if (!result.exec())
MythDB::DBError("forgetNeverHistory", result);
Expand Down
28 changes: 14 additions & 14 deletions mythtv/libs/libmythtv/recordinginfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
{
public:
RecordingInfo(void) :
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand All @@ -56,8 +56,8 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
m_recordingFile(NULL) { LoadRecordingFile(); }
RecordingInfo(const ProgramInfo &other) :
ProgramInfo(other),
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand All @@ -67,8 +67,8 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
m_recordingFile(NULL) { LoadRecordingFile(); }
RecordingInfo(uint _recordedid) :
ProgramInfo(_recordedid),
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand All @@ -78,8 +78,8 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
m_recordingFile(NULL) { LoadRecordingFile(); }
RecordingInfo(uint _chanid, const QDateTime &_recstartts) : /// DEPRECATED
ProgramInfo(_chanid, _recstartts),
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand All @@ -90,8 +90,8 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
RecordingInfo(QStringList::const_iterator &it,
QStringList::const_iterator end) :
ProgramInfo(it, end),
oldrecstatus(rsUnknown),
savedrecstatus(rsUnknown),
oldrecstatus(RecStatus::Unknown),
savedrecstatus(RecStatus::Unknown),
future(false),
schedorder(0),
mplexid(0),
Expand Down Expand Up @@ -143,7 +143,7 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo

bool repeat,

RecStatusType oldrecstatus,
RecStatus::Type oldrecstatus,
bool reactivate,

uint recordid,
Expand Down Expand Up @@ -194,7 +194,7 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
const QDateTime &recstartts,
const QDateTime &recendts,

RecStatusType recstatus,
RecStatus::Type recstatus,

uint recordid,
RecordingType rectype,
Expand Down Expand Up @@ -301,8 +301,8 @@ class MTV_PUBLIC RecordingInfo : public ProgramInfo
void SetFilesize( uint64_t sz ); /// Will replace the one in ProgramInfo
uint64_t GetFilesize(void) const; /// Will replace the one in ProgramInfo

RecStatusType oldrecstatus;
RecStatusType savedrecstatus;
RecStatus::Type oldrecstatus;
RecStatus::Type savedrecstatus;
bool future;
int schedorder;
uint mplexid; // Only valid within the scheduler
Expand Down
118 changes: 59 additions & 59 deletions mythtv/libs/libmythtv/tv_rec.cpp
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/tv_rec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
bool Init(void);

void RecordPending(const ProgramInfo *rcinfo, int secsleft, bool hasLater);
RecStatusType StartRecording(ProgramInfo *rcinfo);
RecStatusType GetRecordingStatus(void) const;
RecStatus::Type StartRecording(ProgramInfo *rcinfo);
RecStatus::Type GetRecordingStatus(void) const;

void StopRecording(bool killFile = false);
/// \brief Tells TVRec to finish the current recording as soon as possible.
Expand Down Expand Up @@ -325,7 +325,7 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
RecordingProfile *, int line);

void SetRecordingStatus(
RecStatusType new_status, int line, bool have_lock = false);
RecStatus::Type new_status, int line, bool have_lock = false);

QString LoadProfile(QString ,void*, RecordingInfo*,
RecordingProfile&);
Expand Down Expand Up @@ -389,7 +389,7 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
QWaitCondition triggerEventSleepWait;
bool triggerEventSleepSignal;
volatile bool switchingBuffer;
RecStatusType m_recStatus;
RecStatus::Type m_recStatus;

// Current recording info
RecordingInfo *curRecording;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/backendhousekeeper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ void CleanupTask::CleanupProgramListings(void)
query.prepare("DELETE FROM oldrecorded WHERE "
"recstatus <> :RECORDED AND duplicate = 0 AND "
"endtime < DATE_SUB(CURRENT_DATE, INTERVAL :CLEAN DAY);");
query.bindValue(":RECORDED", rsRecorded);
query.bindValue(":RECORDED", RecStatus::Recorded);
query.bindValue(":CLEAN", offset);
if (!query.exec())
MythDB::DBError("HouseKeeper Cleaning Program Listings", query);
Expand Down
12 changes: 6 additions & 6 deletions mythtv/programs/mythbackend/encoderlink.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,9 +432,9 @@ int EncoderLink::LockTuner()
* -1 if TVRec is busy doing something else, 0 otherwise.
* \sa RecordPending(const ProgramInfo*, int, bool), StopRecording()
*/
RecStatusType EncoderLink::StartRecording(ProgramInfo *rec)
RecStatus::Type EncoderLink::StartRecording(ProgramInfo *rec)
{
RecStatusType retval = rsAborted;
RecStatus::Type retval = RecStatus::Aborted;

endRecordingTime = rec->GetRecordingEndTime();
startRecordingTime = rec->GetRecordingStartTime();
Expand All @@ -453,7 +453,7 @@ RecStatusType EncoderLink::StartRecording(ProgramInfo *rec)
"but the backend is not there anymore\n")
.arg(m_capturecardnum));

if (retval != rsRecording && retval != rsTuning && retval != rsFailing)
if (retval != RecStatus::Recording && retval != RecStatus::Tuning && retval != RecStatus::Failing)
{
endRecordingTime = MythDate::current().addDays(-2);
startRecordingTime = endRecordingTime;
Expand All @@ -463,9 +463,9 @@ RecStatusType EncoderLink::StartRecording(ProgramInfo *rec)
return retval;
}

RecStatusType EncoderLink::GetRecordingStatus(void)
RecStatus::Type EncoderLink::GetRecordingStatus(void)
{
RecStatusType retval = rsAborted;
RecStatus::Type retval = RecStatus::Aborted;

if (local)
retval = tv->GetRecordingStatus();
Expand All @@ -480,7 +480,7 @@ RecStatusType EncoderLink::GetRecordingStatus(void)
"but the backend is not there anymore\n")
.arg(m_capturecardnum));

if (retval != rsRecording && retval != rsTuning && retval != rsFailing)
if (retval != RecStatus::Recording && retval != RecStatus::Tuning && retval != RecStatus::Failing)
{
endRecordingTime = MythDate::current().addDays(-2);
startRecordingTime = endRecordingTime;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythbackend/encoderlink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ class EncoderLink

bool MatchesRecording(const ProgramInfo *rec);
void RecordPending(const ProgramInfo *rec, int secsleft, bool hasLater);
RecStatusType StartRecording(ProgramInfo *rec);
RecStatusType GetRecordingStatus(void);
RecStatus::Type StartRecording(ProgramInfo *rec);
RecStatus::Type GetRecordingStatus(void);
void StopRecording(bool killFile = false);
void FinishRecording(void);
void FrontendReady(void);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythbackend/httpstatus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ void HttpStatus::FillStatusXML( QDomDocument *pDoc )
RecConstIter itProg = recordingList.begin();
for (; (itProg != recordingList.end()) && iNumRecordings < iNum; ++itProg)
{
if (((*itProg)->GetRecordingStatus() <= rsWillRecord) &&
if (((*itProg)->GetRecordingStatus() <= RecStatus::WillRecord) &&
((*itProg)->GetRecordingStartTime() >=
MythDate::current()))
{
Expand Down Expand Up @@ -1552,7 +1552,7 @@ void HttpStatus::FillProgramInfo(QDomDocument *pDoc,

// Build Recording Child Element

if ( pInfo->GetRecordingStatus() != rsUnknown )
if ( pInfo->GetRecordingStatus() != RecStatus::Unknown )
{
QDomElement recording = pDoc->createElement( "Recording" );
program.appendChild( recording );
Expand Down
12 changes: 6 additions & 6 deletions mythtv/programs/mythbackend/mainserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ void MainServer::customEvent(QEvent *e)
uint cardid = tokens[1].toUInt();
uint chanid = tokens[2].toUInt();
QDateTime startts = MythDate::fromString(tokens[3]);
RecStatusType recstatus = RecStatusType(tokens[4].toInt());
RecStatus::Type recstatus = RecStatus::Type(tokens[4].toInt());
QDateTime recendts = MythDate::fromString(tokens[5]);
m_sched->UpdateRecStatus(cardid, chanid, startts,
recstatus, recendts);
Expand Down Expand Up @@ -2725,9 +2725,9 @@ void MainServer::HandleStopRecording(QStringList &slist, PlaybackSock *pbs)
for( uint n = 0; n < schedList.size(); n++)
{
ProgramInfo *pInfo = schedList[n];
if ((pInfo->GetRecordingStatus() == rsTuning ||
pInfo->GetRecordingStatus() == rsFailing ||
pInfo->GetRecordingStatus() == rsRecording)
if ((pInfo->GetRecordingStatus() == RecStatus::Tuning ||
pInfo->GetRecordingStatus() == RecStatus::Failing ||
pInfo->GetRecordingStatus() == RecStatus::Recording)
&& recinfo.IsSameProgram(*pInfo))
recinfo.SetChanID(pInfo->GetChanID());
}
Expand All @@ -2744,12 +2744,12 @@ void MainServer::DoHandleStopRecording(
pbssock = pbs->getSocket();

// FIXME! We don't know what state the recorder is in at this
// time. Simply set the recstatus to rsUnknown and let the
// time. Simply set the recstatus to RecStatus::Unknown and let the
// scheduler do the best it can with it. The proper long term fix
// is probably to have the recorder return the actual recstatus as
// part of the stop recording response. That's a more involved
// change than I care to make during the 0.25 code freeze.
recinfo.SetRecordingStatus(rsUnknown);
recinfo.SetRecordingStatus(RecStatus::Unknown);

if (ismaster && recinfo.GetHostname() != gCoreContext->GetHostName())
{
Expand Down
12 changes: 6 additions & 6 deletions mythtv/programs/mythbackend/playbacksock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ bool PlaybackSock::EncoderIsRecording(int capturecardnum,
return false;
}

RecStatusType PlaybackSock::StartRecording(int capturecardnum,
RecStatus::Type PlaybackSock::StartRecording(int capturecardnum,
ProgramInfo *pginfo)
{
QStringList strlist(QString("QUERY_REMOTEENCODER %1").arg(capturecardnum));
Expand All @@ -459,13 +459,13 @@ RecStatusType PlaybackSock::StartRecording(int capturecardnum,
pginfo->SetRecordingID(strlist[1].toUInt());
pginfo->SetRecordingStartTime(
MythDate::fromTime_t(strlist[2].toUInt()));
return RecStatusType(strlist[0].toInt());
return RecStatus::Type(strlist[0].toInt());
}

return rsUnknown;
return RecStatus::Unknown;
}

RecStatusType PlaybackSock::GetRecordingStatus(int capturecardnum)
RecStatus::Type PlaybackSock::GetRecordingStatus(int capturecardnum)
{
QStringList strlist(QString("QUERY_REMOTEENCODER %1").arg(capturecardnum));
strlist << "GET_RECORDING_STATUS";
Expand All @@ -476,10 +476,10 @@ RecStatusType PlaybackSock::GetRecordingStatus(int capturecardnum)
QString("QUERY_REMOTEENCODER %1").arg(capturecardnum) +
" did not respond.");

return rsUnknown;
return RecStatus::Unknown;
}

return RecStatusType(strlist[0].toInt());
return RecStatus::Type(strlist[0].toInt());
}

void PlaybackSock::RecordPending(int capturecardnum, const ProgramInfo *pginfo,
Expand Down
7 changes: 4 additions & 3 deletions mythtv/programs/mythbackend/playbacksock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ using namespace std;
#include <QSize>

#include "referencecounter.h"
#include "programinfo.h" // For RecStatusType
#include "programinfo.h" // ProgramInfo
#include "programtypes.h" // RecStatus::Type
#include "inputinfo.h"

class MythSocket;
Expand Down Expand Up @@ -93,9 +94,9 @@ class PlaybackSock : public ReferenceCounter
long long GetMaxBitrate(int capturecardnum);
ProgramInfo *GetRecording(uint cardid);
bool EncoderIsRecording(int capturecardnum, const ProgramInfo *pginfo);
RecStatusType StartRecording(int capturecardnum,
RecStatus::Type StartRecording(int capturecardnum,
ProgramInfo *pginfo);
RecStatusType GetRecordingStatus(int capturecardnum);
RecStatus::Type GetRecordingStatus(int capturecardnum);
void RecordPending(int capturecardnum, const ProgramInfo *pginfo,
int secsleft, bool hasLater);
int SetSignalMonitoringRate(int capturecardnum, int rate, int notifyFrontend);
Expand Down
354 changes: 177 additions & 177 deletions mythtv/programs/mythbackend/scheduler.cpp
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions mythtv/programs/mythbackend/scheduler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Scheduler : public MThread, public MythScheduler

void UpdateRecStatus(RecordingInfo *pginfo);
void UpdateRecStatus(uint cardid, uint chanid,
const QDateTime &startts, RecStatusType recstatus,
const QDateTime &startts, RecStatus::Type recstatus,
const QDateTime &recendts);
// Returns a list of all pending recordings and returns
// true iff there are conflicts
Expand Down Expand Up @@ -95,7 +95,7 @@ class Scheduler : public MThread, public MythScheduler

bool WasStartedAutomatically();

RecStatusType GetRecStatus(const ProgramInfo &pginfo);
RecStatus::Type GetRecStatus(const ProgramInfo &pginfo);

int GetError(void) const { return error; }

Expand Down Expand Up @@ -190,7 +190,7 @@ class Scheduler : public MThread, public MythScheduler
QDateTime &nextStartTime, QDateTime &nextWakeTime,
int prerollseconds);
void HandleRecordingStatusChange(
RecordingInfo &ri, RecStatusTypes recStatus, const QString &details);
RecordingInfo &ri, RecStatus::Type recStatus, const QString &details);
void HandleIdleShutdown(
bool &blockShutdown, QDateTime &idleSince, int prerollseconds,
int idleTimeoutSecs, int idleWaitForRecordingTime,
Expand Down
16 changes: 8 additions & 8 deletions mythtv/programs/mythbackend/services/dvr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,9 +573,9 @@ DTC::ProgramList* Dvr::GetUpcomingList( int nStartIndex,
((*it)->GetRecordingStatus() != nRecStatus))
continue;

if (!bShowAll && ((((*it)->GetRecordingStatus() >= rsFailing) &&
((*it)->GetRecordingStatus() <= rsWillRecord)) ||
((*it)->GetRecordingStatus() == rsConflict)) &&
if (!bShowAll && ((((*it)->GetRecordingStatus() >= RecStatus::Failing) &&
((*it)->GetRecordingStatus() <= RecStatus::WillRecord)) ||
((*it)->GetRecordingStatus() == RecStatus::Conflict)) &&
((*it)->GetRecordingEndTime() > MythDate::current()))
{
recordingList.push_back(new RecordingInfo(**it));
Expand Down Expand Up @@ -643,7 +643,7 @@ DTC::ProgramList* Dvr::GetConflictList( int nStartIndex,
(*it)->GetRecordingRuleID() != static_cast<uint>(nRecordId))
continue;

if (((*it)->GetRecordingStatus() == rsConflict) &&
if (((*it)->GetRecordingStatus() == RecStatus::Conflict) &&
((*it)->GetRecordingStartTime() >= MythDate::current()))
{
recordingList.push_back(new RecordingInfo(**it));
Expand Down Expand Up @@ -1180,18 +1180,18 @@ bool Dvr::DisableRecordSchedule( uint nRecordId )

QString Dvr::RecStatusToString(int RecStatus)
{
RecStatusType type = static_cast<RecStatusType>(RecStatus);
return toString(type);
RecStatus::Type type = static_cast<RecStatus::Type>(RecStatus);
return RecStatus::toString(type);
}

QString Dvr::RecStatusToDescription(int RecStatus, int recType,
const QDateTime &StartTime)
{
//if (!StartTime.isValid())
// throw QString("StartTime appears invalid.");
RecStatusType rsType = static_cast<RecStatusType>(RecStatus);
RecStatus::Type rsType = static_cast<RecStatus::Type>(RecStatus);
RecordingType recordingType = static_cast<RecordingType>(recType);
return toDescription(rsType, recordingType, StartTime);
return RecStatus::toDescription(rsType, recordingType, StartTime);
}

QString Dvr::RecTypeToString(QString recType)
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/services/serviceUtil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void FillProgramInfo( DTC::Program *pProgram,

// Build Recording Child Element

if ( pInfo->GetRecordingStatus() != rsUnknown )
if ( pInfo->GetRecordingStatus() != RecStatus::Unknown )
{
pProgram->setSerializeRecording( true );

Expand Down
6 changes: 3 additions & 3 deletions mythtv/programs/mythfrontend/guidegrid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1630,10 +1630,10 @@ void GuideUpdateProgramRow::fillProgramRowInfosWith(int row, int chanNum,
}

int recStat;
if (pginfo->GetRecordingStatus() == rsConflict ||
pginfo->GetRecordingStatus() == rsOffLine)
if (pginfo->GetRecordingStatus() == RecStatus::Conflict ||
pginfo->GetRecordingStatus() == RecStatus::Offline)
recStat = 2;
else if (pginfo->GetRecordingStatus() <= rsWillRecord)
else if (pginfo->GetRecordingStatus() <= RecStatus::WillRecord)
recStat = 1;
else
recStat = 0;
Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythfrontend/idlescreen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,20 @@ void IdleScreen::UpdateScreen(void)
if (progInfo)
{
MythUIButtonList *list = NULL;
const RecStatusType recstatus = progInfo->GetRecordingStatus();
const RecStatus::Type recstatus = progInfo->GetRecordingStatus();

switch(recstatus)
{
case rsRecording:
case rsTuning:
case RecStatus::Recording:
case RecStatus::Tuning:
list = m_currentRecordings;
break;

case rsWillRecord:
case RecStatus::WillRecord:
list = m_nextRecordings;
break;

case rsConflict:
case RecStatus::Conflict:
list = m_conflictingRecordings;
break;

Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,7 @@ static bool WasAutomaticStart(void)
ProgramList::const_iterator it = progList.begin();
for (; it != progList.end(); ++it)
{
if (((*it)->GetRecordingStatus() == rsWillRecord) &&
if (((*it)->GetRecordingStatus() == RecStatus::WillRecord) &&
((*it)->GetHostname() == hostname) &&
(nextRecordingStart.isNull() ||
nextRecordingStart > (*it)->GetRecordingStartTime()))
Expand Down
14 changes: 7 additions & 7 deletions mythtv/programs/mythfrontend/playbackbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ static QString extract_main_state(const ProgramInfo &pginfo, const TV *player)
QString state("normal");
if (pginfo.GetFilesize() == 0)
state = "error";
else if (pginfo.GetRecordingStatus() == rsRecording)
else if (pginfo.GetRecordingStatus() == RecStatus::Recording)
state = "running";

if (((pginfo.GetRecordingStatus() != rsRecording) &&
if (((pginfo.GetRecordingStatus() != RecStatus::Recording) &&
(pginfo.GetAvailableStatus() != asAvailable) &&
(pginfo.GetAvailableStatus() != asNotYetAvailable)) ||
(player && player->IsSameProgram(0, &pginfo)))
Expand All @@ -288,8 +288,8 @@ static QString extract_job_state(const ProgramInfo &pginfo)
{
QString job = "default";

if (pginfo.GetRecordingStatus() == rsRecording ||
pginfo.GetRecordingStatus() == rsFailing)
if (pginfo.GetRecordingStatus() == RecStatus::Recording ||
pginfo.GetRecordingStatus() == RecStatus::Failing)
job = "recording";
else if (JobQueue::IsJobQueuedOrRunning(
JOB_TRANSCODE, pginfo.GetChanID(),
Expand Down Expand Up @@ -713,7 +713,7 @@ void PlaybackBox::updateGroupInfo(const QString &groupname,
{
uint64_t filesize = info->GetFilesize();
// This query should be unnecessary if the ProgramInfo Updater is working
// if (filesize == 0 || info->GetRecordingStatus() == rsRecording)
// if (filesize == 0 || info->GetRecordingStatus() == RecStatus::Recording)
// {
// filesize = info->QueryFilesize();
// info->SetFilesize(filesize);
Expand Down Expand Up @@ -3165,7 +3165,7 @@ void PlaybackBox::ShowActionPopup(const ProgramInfo &pginfo)
}
}

if (pginfo.GetRecordingStatus() == rsRecording &&
if (pginfo.GetRecordingStatus() == RecStatus::Recording &&
(!(sameProgram &&
(tvstate == kState_WatchingLiveTV ||
tvstate == kState_WatchingRecording))))
Expand Down Expand Up @@ -3936,7 +3936,7 @@ void PlaybackBox::customEvent(QEvent *event)
ProgramInfo evinfo(recordingID);
if (evinfo.GetChanID())
{
evinfo.SetRecordingStatus(rsRecording);
evinfo.SetRecordingStatus(RecStatus::Recording);
HandleRecordingAddEvent(evinfo);
}
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/playbackboxhelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ AvailableStatusType PBHEventHandler::CheckAvailability(const QStringList &slist)
// if (!evinfo.GetFilesize())
// {
availableStatus =
(evinfo.GetRecordingStatus() == rsRecording) ?
(evinfo.GetRecordingStatus() == RecStatus::Recording) ?
asNotYetAvailable : asZeroByte;
// }
}
Expand Down
24 changes: 12 additions & 12 deletions mythtv/programs/mythfrontend/progdetails.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,14 +524,14 @@ void ProgDetails::loadPage(void)
// Begin MythTV information not found in the listings info
// msg += "<br>";
QDateTime statusDate;
if (m_progInfo.GetRecordingStatus() == rsWillRecord)
if (m_progInfo.GetRecordingStatus() == RecStatus::WillRecord)
statusDate = m_progInfo.GetScheduledStartTime();

RecordingType rectype = kSingleRecord; // avoid kNotRecording
RecStatusType recstatus = m_progInfo.GetRecordingStatus();
RecStatus::Type recstatus = m_progInfo.GetRecordingStatus();

if (recstatus == rsPreviousRecording || recstatus == rsNeverRecord ||
recstatus == rsUnknown)
if (recstatus == RecStatus::PreviousRecording || recstatus == RecStatus::NeverRecord ||
recstatus == RecStatus::Unknown)
{
query.prepare("SELECT recstatus, starttime "
"FROM oldrecorded WHERE duplicate > 0 AND "
Expand All @@ -552,23 +552,23 @@ void ProgDetails::loadPage(void)
}
else if (query.next())
{
if (recstatus == rsUnknown)
recstatus = RecStatusType(query.value(0).toInt());
if (recstatus == RecStatus::Unknown)
recstatus = RecStatus::Type(query.value(0).toInt());

if (recstatus == rsPreviousRecording ||
recstatus == rsNeverRecord ||
recstatus == rsRecorded)
if (recstatus == RecStatus::PreviousRecording ||
recstatus == RecStatus::NeverRecord ||
recstatus == RecStatus::Recorded)
{
statusDate = MythDate::as_utc(query.value(1).toDateTime());
}
}
}

if (recstatus == rsUnknown)
if (recstatus == RecStatus::Unknown)
{
if (recorded)
{
recstatus = rsRecorded;
recstatus = RecStatus::Recorded;
statusDate = m_progInfo.GetScheduledStartTime();
}
else
Expand All @@ -578,7 +578,7 @@ void ProgDetails::loadPage(void)
}
}

s = toString(recstatus, rectype);
s = RecStatus::toString(recstatus, rectype);

if (statusDate.isValid())
s += " " + MythDate::toString(statusDate, MythDate::kDateFull | MythDate::kAddYear);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/progfind.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ void ProgFinder::updateTimesList()
m_showData[i]->ToMap(infoMap);
item->SetTextFromMap(infoMap);

QString state = toUIState(m_showData[i]->GetRecordingStatus());
QString state = RecStatus::toUIState(m_showData[i]->GetRecordingStatus());
item->SetText(itemText, "buttontext", state);
item->DisplayState(state, "status");
}
Expand Down
10 changes: 5 additions & 5 deletions mythtv/programs/mythfrontend/proglist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1058,14 +1058,14 @@ class plTitleSort : public plCompare
if (a->GetRecordingStatus() == b->GetRecordingStatus())
return a->GetScheduledStartTime() < b->GetScheduledStartTime();

if (a->GetRecordingStatus() == rsRecording)
if (a->GetRecordingStatus() == RecStatus::Recording)
return true;
if (b->GetRecordingStatus() == rsRecording)
if (b->GetRecordingStatus() == RecStatus::Recording)
return false;

if (a->GetRecordingStatus() == rsWillRecord)
if (a->GetRecordingStatus() == RecStatus::WillRecord)
return true;
if (b->GetRecordingStatus() == rsWillRecord)
if (b->GetRecordingStatus() == RecStatus::WillRecord)
return false;

return a->GetScheduledStartTime() < b->GetScheduledStartTime();
Expand Down Expand Up @@ -1534,7 +1534,7 @@ void ProgLister::HandleVisible(MythUIButtonListItem *item)
InfoMap infoMap;
pginfo->ToMap(infoMap);

QString state = toUIState(pginfo->GetRecordingStatus());
QString state = RecStatus::toUIState(pginfo->GetRecordingStatus());
if ((state == "warning") && (plPreviouslyRecorded == m_type))
state = "disabled";

Expand Down
36 changes: 18 additions & 18 deletions mythtv/programs/mythfrontend/programrecpriority.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ void ProgramRecPriority::scheduleChanged(int recid)
progInfo.recType = record.m_type;
progInfo.sortTitle = record.m_title;
progInfo.recstatus = record.m_isInactive ?
rsInactive : rsUnknown;
RecStatus::Inactive : RecStatus::Unknown;
progInfo.profile = record.m_recProfile;
progInfo.last_record = record.m_lastRecorded;

Expand Down Expand Up @@ -979,7 +979,7 @@ void ProgramRecPriority::scheduleChanged(int recid)
m_origRecPriorityData[pgRecInfo->GetRecordingRuleID()] =
pgRecInfo->GetRecordingPriority();
// also set the active/inactive state
pgRecInfo->recstatus = inactive ? rsInactive : rsUnknown;
pgRecInfo->recstatus = inactive ? RecStatus::Inactive : RecStatus::Unknown;

SortList();
}
Expand Down Expand Up @@ -1081,7 +1081,7 @@ void ProgramRecPriority::deactivate(void)
QString("DeactivateRule %1 %2")
.arg(pgRecInfo->GetRecordingRuleID())
.arg(pgRecInfo->GetTitle()));
pgRecInfo->recstatus = inactive ? rsInactive : rsUnknown;
pgRecInfo->recstatus = inactive ? RecStatus::Inactive : RecStatus::Unknown;
item->DisplayState("disabled", "status");
}
}
Expand Down Expand Up @@ -1221,15 +1221,15 @@ void ProgramRecPriority::FillList(void)
progInfo->profile = profile;

if (inactive)
progInfo->recstatus = rsInactive;
progInfo->recstatus = RecStatus::Inactive;
else if (m_conMatch[progInfo->GetRecordingRuleID()] > 0)
progInfo->recstatus = rsConflict;
progInfo->recstatus = RecStatus::Conflict;
else if (m_nowMatch[progInfo->GetRecordingRuleID()] > 0)
progInfo->recstatus = rsRecording;
progInfo->recstatus = RecStatus::Recording;
else if (m_recMatch[progInfo->GetRecordingRuleID()] > 0)
progInfo->recstatus = rsWillRecord;
progInfo->recstatus = RecStatus::WillRecord;
else
progInfo->recstatus = rsUnknown;
progInfo->recstatus = RecStatus::Unknown;
}
} while (result.next());
}
Expand All @@ -1248,16 +1248,16 @@ void ProgramRecPriority::countMatches()
ProgramList::const_iterator it = schedList.begin();
for (; it != schedList.end(); ++it)
{
const RecStatusType recstatus = (**it).GetRecordingStatus();
const RecStatus::Type recstatus = (**it).GetRecordingStatus();
const uint recordid = (**it).GetRecordingRuleID();
if ((**it).GetRecordingEndTime() > now && recstatus != rsNotListed)
if ((**it).GetRecordingEndTime() > now && recstatus != RecStatus::NotListed)
{
m_listMatch[recordid]++;
if (recstatus == rsConflict || recstatus == rsOffLine)
if (recstatus == RecStatus::Conflict || recstatus == RecStatus::Offline)
m_conMatch[recordid]++;
else if (recstatus == rsWillRecord)
else if (recstatus == RecStatus::WillRecord)
m_recMatch[recordid]++;
else if (recstatus == rsRecording)
else if (recstatus == RecStatus::Recording)
{
m_nowMatch[recordid]++;
m_recMatch[recordid]++;
Expand Down Expand Up @@ -1358,7 +1358,7 @@ void ProgramRecPriority::UpdateList()
QString state;
if (progInfo->recType == kDontRecord ||
(progInfo->recType != kTemplateRecord &&
progInfo->recstatus == rsInactive))
progInfo->recstatus == RecStatus::Inactive))
state = "disabled";
else if (m_conMatch[progInfo->GetRecordingRuleID()] > 0)
state = "error";
Expand All @@ -1384,11 +1384,11 @@ void ProgramRecPriority::UpdateList()
}

QString matchInfo;
if (progInfo->GetRecordingStatus() == rsInactive)
if (progInfo->GetRecordingStatus() == RecStatus::Inactive)
{
matchInfo = QString("%1 %2")
.arg(m_listMatch[progInfo->GetRecordingRuleID()])
.arg(toString(progInfo->GetRecordingStatus(),
.arg(RecStatus::toString(progInfo->GetRecordingStatus(),
progInfo->GetRecordingRuleType()));
}
else
Expand Down Expand Up @@ -1477,11 +1477,11 @@ void ProgramRecPriority::updateInfo(MythUIButtonListItem *item)
}

QString matchInfo;
if (pgRecInfo->GetRecordingStatus() == rsInactive)
if (pgRecInfo->GetRecordingStatus() == RecStatus::Inactive)
{
matchInfo = QString("%1 %2")
.arg(m_listMatch[pgRecInfo->GetRecordingRuleID()])
.arg(toString(pgRecInfo->GetRecordingStatus(),
.arg(RecStatus::toString(pgRecInfo->GetRecordingStatus(),
pgRecInfo->GetRecordingRuleType()));
}
else
Expand Down
60 changes: 30 additions & 30 deletions mythtv/programs/mythfrontend/schedulecommon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@ void ScheduleCommon::EditRecording(void)
QString message = recinfo.toString(ProgramInfo::kTitleSubtitle, " - ");

message += "\n\n";
message += toDescription(recinfo.GetRecordingStatus(),
message += RecStatus::toDescription(recinfo.GetRecordingStatus(),
recinfo.GetRecordingRuleType(),
recinfo.GetRecordingStartTime());

if (recinfo.GetRecordingStatus() == rsConflict ||
recinfo.GetRecordingStatus() == rsLaterShowing)
if (recinfo.GetRecordingStatus() == RecStatus::Conflict ||
recinfo.GetRecordingStatus() == RecStatus::LaterShowing)
{
vector<ProgramInfo *> *confList = RemoteGetConflictList(&recinfo);

Expand Down Expand Up @@ -323,7 +323,7 @@ void ScheduleCommon::EditRecording(void)

QDateTime now = MythDate::current();

if (recinfo.GetRecordingStatus() == rsUnknown)
if (recinfo.GetRecordingStatus() == RecStatus::Unknown)
{
if (recinfo.GetRecordingEndTime() > now)
menuPopup->AddButton(tr("Record this showing"),
Expand All @@ -345,9 +345,9 @@ void ScheduleCommon::EditRecording(void)
menuPopup->AddButton(tr("Edit recording rule"),
qVariantFromValue(recinfo));
}
else if (recinfo.GetRecordingStatus() == rsRecording ||
recinfo.GetRecordingStatus() == rsTuning ||
recinfo.GetRecordingStatus() == rsFailing)
else if (recinfo.GetRecordingStatus() == RecStatus::Recording ||
recinfo.GetRecordingStatus() == RecStatus::Tuning ||
recinfo.GetRecordingStatus() == RecStatus::Failing)
{
menuPopup->AddButton(tr("Stop this recording"),
qVariantFromValue(recinfo));
Expand All @@ -358,8 +358,8 @@ void ScheduleCommon::EditRecording(void)
{
if (recinfo.GetRecordingStartTime() < now &&
recinfo.GetRecordingEndTime() > now &&
recinfo.GetRecordingStatus() != rsDontRecord &&
recinfo.GetRecordingStatus() != rsNotListed)
recinfo.GetRecordingStatus() != RecStatus::DontRecord &&
recinfo.GetRecordingStatus() != RecStatus::NotListed)
{
menuPopup->AddButton(tr("Restart this recording"),
qVariantFromValue(recinfo));
Expand All @@ -368,21 +368,21 @@ void ScheduleCommon::EditRecording(void)
if (recinfo.GetRecordingEndTime() > now &&
recinfo.GetRecordingRuleType() != kSingleRecord &&
recinfo.GetRecordingRuleType() != kOverrideRecord &&
(recinfo.GetRecordingStatus() == rsDontRecord ||
recinfo.GetRecordingStatus() == rsPreviousRecording ||
recinfo.GetRecordingStatus() == rsCurrentRecording ||
recinfo.GetRecordingStatus() == rsEarlierShowing ||
recinfo.GetRecordingStatus() == rsTooManyRecordings ||
recinfo.GetRecordingStatus() == rsLaterShowing ||
recinfo.GetRecordingStatus() == rsRepeat ||
recinfo.GetRecordingStatus() == rsInactive ||
recinfo.GetRecordingStatus() == rsNeverRecord))
(recinfo.GetRecordingStatus() == RecStatus::DontRecord ||
recinfo.GetRecordingStatus() == RecStatus::PreviousRecording ||
recinfo.GetRecordingStatus() == RecStatus::CurrentRecording ||
recinfo.GetRecordingStatus() == RecStatus::EarlierShowing ||
recinfo.GetRecordingStatus() == RecStatus::TooManyRecordings ||
recinfo.GetRecordingStatus() == RecStatus::LaterShowing ||
recinfo.GetRecordingStatus() == RecStatus::Repeat ||
recinfo.GetRecordingStatus() == RecStatus::Inactive ||
recinfo.GetRecordingStatus() == RecStatus::NeverRecord))
{
menuPopup->AddButton(tr("Record this showing"),
qVariantFromValue(recinfo));
if (recinfo.GetRecordingStartTime() > now &&
(recinfo.GetRecordingStatus() == rsPreviousRecording ||
recinfo.GetRecordingStatus() == rsNeverRecord))
(recinfo.GetRecordingStatus() == RecStatus::PreviousRecording ||
recinfo.GetRecordingStatus() == RecStatus::NeverRecord))
{
menuPopup->AddButton(tr("Forget previous recording"),
qVariantFromValue(recinfo));
Expand All @@ -391,16 +391,16 @@ void ScheduleCommon::EditRecording(void)

if (recinfo.GetRecordingRuleType() != kSingleRecord &&
recinfo.GetRecordingRuleType() != kDontRecord &&
(recinfo.GetRecordingStatus() == rsWillRecord ||
recinfo.GetRecordingStatus() == rsCurrentRecording ||
recinfo.GetRecordingStatus() == rsEarlierShowing ||
recinfo.GetRecordingStatus() == rsTooManyRecordings ||
recinfo.GetRecordingStatus() == rsConflict ||
recinfo.GetRecordingStatus() == rsLaterShowing ||
recinfo.GetRecordingStatus() == rsOffLine))
(recinfo.GetRecordingStatus() == RecStatus::WillRecord ||
recinfo.GetRecordingStatus() == RecStatus::CurrentRecording ||
recinfo.GetRecordingStatus() == RecStatus::EarlierShowing ||
recinfo.GetRecordingStatus() == RecStatus::TooManyRecordings ||
recinfo.GetRecordingStatus() == RecStatus::Conflict ||
recinfo.GetRecordingStatus() == RecStatus::LaterShowing ||
recinfo.GetRecordingStatus() == RecStatus::Offline))
{
if (recinfo.GetRecordingStatus() == rsWillRecord ||
recinfo.GetRecordingStatus() == rsConflict)
if (recinfo.GetRecordingStatus() == RecStatus::WillRecord ||
recinfo.GetRecordingStatus() == RecStatus::Conflict)
menuPopup->AddButton(tr("Don't record this showing"),
qVariantFromValue(recinfo));

Expand Down Expand Up @@ -439,7 +439,7 @@ void ScheduleCommon::EditRecording(void)
else
{
if (recinfo.GetRecordingRuleType() != kSingleRecord &&
recinfo.GetRecordingStatus() != rsNotListed)
recinfo.GetRecordingStatus() != RecStatus::NotListed)
menuPopup->AddButton(tr("Add override rule"),
qVariantFromValue(recinfo));
menuPopup->AddButton(tr("Edit recording rule"),
Expand Down
28 changes: 14 additions & 14 deletions mythtv/programs/mythfrontend/statusbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,8 @@ void StatusBox::doScheduleStatus()
return;
}

QMap<RecStatusType, int> statusMatch;
QMap<RecStatusType, QString> statusText;
QMap<RecStatus::Type, int> statusMatch;
QMap<RecStatus::Type, QString> statusText;
QMap<int, int> sourceMatch;
QMap<int, QString> sourceText;
QMap<int, int> cardMatch;
Expand Down Expand Up @@ -722,17 +722,17 @@ void StatusBox::doScheduleStatus()
for (; it != schedList.end(); ++it)
{
const ProgramInfo *s = *it;
const RecStatusType recstatus = s->GetRecordingStatus();
const RecStatus::Type recstatus = s->GetRecordingStatus();

if (statusMatch[recstatus] < 1)
{
statusText[recstatus] = toString(
statusText[recstatus] = RecStatus::toString(
recstatus, s->GetRecordingRuleType());
}

++statusMatch[recstatus];

if (recstatus == rsWillRecord || recstatus == rsRecording)
if (recstatus == RecStatus::WillRecord || recstatus == RecStatus::Recording)
{
++sourceMatch[s->GetSourceID()];
++cardMatch[s->GetInputID()];
Expand All @@ -752,15 +752,15 @@ void StatusBox::doScheduleStatus()
AddLogLine(tmpstr, helpmsg, tmpstr, tmpstr, fstate);\
} \
} while (0)
ADD_STATUS_LOG_LINE(rsRecording, "");
ADD_STATUS_LOG_LINE(rsWillRecord, "");
ADD_STATUS_LOG_LINE(rsConflict, "error");
ADD_STATUS_LOG_LINE(rsTooManyRecordings, "warning");
ADD_STATUS_LOG_LINE(rsLowDiskSpace, "warning");
ADD_STATUS_LOG_LINE(rsLaterShowing, "warning");
ADD_STATUS_LOG_LINE(rsNotListed, "warning");

QString willrec = statusText[rsWillRecord];
ADD_STATUS_LOG_LINE(RecStatus::Recording, "");
ADD_STATUS_LOG_LINE(RecStatus::WillRecord, "");
ADD_STATUS_LOG_LINE(RecStatus::Conflict, "error");
ADD_STATUS_LOG_LINE(RecStatus::TooManyRecordings, "warning");
ADD_STATUS_LOG_LINE(RecStatus::LowDiskSpace, "warning");
ADD_STATUS_LOG_LINE(RecStatus::LaterShowing, "warning");
ADD_STATUS_LOG_LINE(RecStatus::NotListed, "warning");

QString willrec = statusText[RecStatus::WillRecord];

if (lowerpriority > 0)
{
Expand Down
56 changes: 28 additions & 28 deletions mythtv/programs/mythfrontend/viewscheduled.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,21 +276,21 @@ void ViewScheduled::LoadList(bool useExistingData)
while (pit != m_recList.end())
{
ProgramInfo *pginfo = *pit;
const RecStatusType recstatus = pginfo->GetRecordingStatus();
const RecStatus::Type recstatus = pginfo->GetRecordingStatus();
if ((pginfo->GetRecordingEndTime() >= now ||
pginfo->GetScheduledEndTime() >= now ||
recstatus == rsRecording ||
recstatus == rsTuning ||
recstatus == rsFailing) &&
recstatus == RecStatus::Recording ||
recstatus == RecStatus::Tuning ||
recstatus == RecStatus::Failing) &&
(m_showAll ||
(recstatus >= rsFailing &&
recstatus <= rsWillRecord) ||
recstatus == rsDontRecord ||
(recstatus == rsTooManyRecordings &&
(recstatus >= RecStatus::Failing &&
recstatus <= RecStatus::WillRecord) ||
recstatus == RecStatus::DontRecord ||
(recstatus == RecStatus::TooManyRecordings &&
++toomanycounts[pginfo->GetRecordingRuleID()] <= 1) ||
(recstatus > rsTooManyRecordings &&
recstatus != rsRepeat &&
recstatus != rsNeverRecord)))
(recstatus > RecStatus::TooManyRecordings &&
recstatus != RecStatus::Repeat &&
recstatus != RecStatus::NeverRecord)))
{
m_inputref[pginfo->GetInputID()]++;
if (pginfo->GetInputID() > m_maxinput)
Expand Down Expand Up @@ -411,19 +411,19 @@ void ViewScheduled::FillList()

QString state;

const RecStatusType recstatus = pginfo->GetRecordingStatus();
if (recstatus == rsRecording ||
recstatus == rsTuning)
const RecStatus::Type recstatus = pginfo->GetRecordingStatus();
if (recstatus == RecStatus::Recording ||
recstatus == RecStatus::Tuning)
state = "running";
else if (recstatus == rsConflict ||
recstatus == rsOffLine ||
recstatus == rsTunerBusy ||
recstatus == rsFailed ||
recstatus == rsFailing ||
recstatus == rsAborted ||
recstatus == rsMissed)
else if (recstatus == RecStatus::Conflict ||
recstatus == RecStatus::Offline ||
recstatus == RecStatus::TunerBusy ||
recstatus == RecStatus::Failed ||
recstatus == RecStatus::Failing ||
recstatus == RecStatus::Aborted ||
recstatus == RecStatus::Missed)
state = "error";
else if (recstatus == rsWillRecord)
else if (recstatus == RecStatus::WillRecord)
{
if (m_curinput == 0 || pginfo->GetInputID() == m_curinput)
{
Expand All @@ -433,11 +433,11 @@ void ViewScheduled::FillList()
state = "normal";
}
}
else if (recstatus == rsRepeat ||
recstatus == rsNeverRecord ||
recstatus == rsDontRecord ||
(recstatus != rsDontRecord &&
recstatus <= rsEarlierShowing))
else if (recstatus == RecStatus::Repeat ||
recstatus == RecStatus::NeverRecord ||
recstatus == RecStatus::DontRecord ||
(recstatus != RecStatus::DontRecord &&
recstatus <= RecStatus::EarlierShowing))
state = "disabled";
else
state = "warning";
Expand Down Expand Up @@ -467,7 +467,7 @@ void ViewScheduled::FillList()
for (; it != plist.end(); ++it)
{
ProgramInfo &p = **it;
if (p.GetRecordingStatus() == rsConflict)
if (p.GetRecordingStatus() == RecStatus::Conflict)
{
m_conflictDate = p.GetRecordingStartTime()
.toLocalTime().date();
Expand Down
20 changes: 10 additions & 10 deletions mythtv/programs/mythfrontend/viewschedulediff.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ void ViewScheduleDiff::showStatus(MythUIButtonListItem *item)

QString message = pi->toString(ProgramInfo::kTitleSubtitle, " - ");
message += "\n\n";
message += toDescription(pi->GetRecordingStatus(),
message += RecStatus::toDescription(pi->GetRecordingStatus(),
pi->GetRecordingRuleType(),
pi->GetRecordingStartTime());

if (pi->GetRecordingStatus() == rsConflict ||
pi->GetRecordingStatus() == rsLaterShowing)
if (pi->GetRecordingStatus() == RecStatus::Conflict ||
pi->GetRecordingStatus() == RecStatus::LaterShowing)
{
message += " " + QObject::tr("The following programs will be recorded "
"instead:") + "\n\n";
Expand All @@ -121,8 +121,8 @@ void ViewScheduleDiff::showStatus(MythUIButtonListItem *item)
if (pa->GetRecordingStartTime() >= pi->GetRecordingEndTime())
break;
if (pa->GetRecordingEndTime() > pi->GetRecordingStartTime() &&
(pa->GetRecordingStatus() == rsWillRecord ||
pa->GetRecordingStatus() == rsRecording))
(pa->GetRecordingStatus() == RecStatus::WillRecord ||
pa->GetRecordingStatus() == RecStatus::Recording))
{
message += QString("%1 - %2 %3\n")
.arg(pa->GetRecordingStartTime()
Expand Down Expand Up @@ -172,8 +172,8 @@ static int comp_recstart(const ProgramInfo *a, const ProgramInfo *b)
return -1;
}
if (a->GetRecordingPriority() != b->GetRecordingPriority() &&
(a->GetRecordingStatus() == rsWillRecord ||
b->GetRecordingStatus() == rsWillRecord))
(a->GetRecordingStatus() == RecStatus::WillRecord ||
b->GetRecordingStatus() == RecStatus::WillRecord))
{
if (a->GetRecordingPriority() < b->GetRecordingPriority())
return 1;
Expand Down Expand Up @@ -299,20 +299,20 @@ void ViewScheduleDiff::updateUIList(void)
InfoMap infoMap;
pginfo->ToMap(infoMap);

QString state = toUIState(pginfo->GetRecordingStatus());
QString state = RecStatus::toUIState(pginfo->GetRecordingStatus());

item->DisplayState(state, "status");
item->SetTextFromMap(infoMap, state);

if (s.before)
item->SetText(toString(s.before->GetRecordingStatus(),
item->SetText(RecStatus::toString(s.before->GetRecordingStatus(),
s.before->GetInputID()), "statusbefore",
state);
else
item->SetText("-", "statusbefore");

if (s.after)
item->SetText(toString(s.after->GetRecordingStatus(),
item->SetText(RecStatus::toString(s.after->GetRecordingStatus(),
s.after->GetInputID()), "statusafter",
state);
else
Expand Down