Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/html/tv/schedule.qsp b/mythtv/html/tv/schedule.qsp
- index 296ba6b..070ff2f 100644
- --- a/mythtv/html/tv/schedule.qsp
- +++ b/mythtv/html/tv/schedule.qsp
- @@ -8,6 +8,7 @@ import "/tv/js/tvutil.qjs"
- var myth = new Myth();
- var dvr = new Dvr();
- var guide = new Guide();
- + var rtti = new Rtti();
- var startTime;
- if (getArg("StartTime"))
- @@ -283,11 +284,14 @@ import "/tv/js/tvutil.qjs"
- <div class="setting setting-select">
- <label for="DupMethod"><%=qsTr("Duplicate Matching")%>:</label>
- <select name="DupMethod" id="rule-DupMethod" required>
- - <% for (var name in RecordingDupMethodType)
- + <% var enumDupMethod = rtti.GetEnum( "RecordingInfo.RecordingDupMethodEnum" );
- + for (var nIdx=0; nIdx < enumDupMethod.EnumItems.length; nIdx++)
- {
- - var selected = (RecordingDupMethodType[name] == recRule.DupMethod) ? "selected" : "";
- + var enumItem = enumDupMethod.EnumItems[ nIdx ];
- +
- + var selected = (enumItem.Key == recRule.DupMethod) ? "selected" : "";
- %>
- - <option value="<%=RecordingDupMethodType[name]%>" <%=selected%>><%=dvr.DupMethodToDescription(RecordingDupMethodType[name])%></option>
- + <option value="<%=enumItem.Value%>" <%=selected%>><%=enumItem.Desc%></option>
- <% } %>
- </select>
- </div>
- diff --git a/mythtv/i18n/translate.pro b/mythtv/i18n/translate.pro
- index 210d990..d7eb69a 100644
- --- a/mythtv/i18n/translate.pro
- +++ b/mythtv/i18n/translate.pro
- @@ -30,6 +30,13 @@ SOURCES += ../libs/libmythui/*.cpp
- SOURCES += ../libs/libmythui/*.h
- SOURCES += ../libs/libmythupnp/*.cpp
- SOURCES += ../libs/libmythupnp/*.h
- +SOURCES += ../libs/libmythservicecontracts/*.h
- +SOURCES += ../libs/libmythservicecontracts/*.cpp
- +SOURCES += ../libs/libmythservicecontracts/datacontracts/*.h
- +SOURCES += ../libs/libmythservicecontracts/datacontracts/*.cpp
- +SOURCES += ../libs/libmythservicecontracts/services/*.h
- +SOURCES += ../libs/libmythservicecontracts/services/*.cpp
- +
- SOURCES += ../programs/mythbackend/*.cpp
- SOURCES += ../programs/mythbackend/*.h
- SOURCES += ../programs/mythcommflag/*.cpp
- diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/recRule.h b/mythtv/libs/libmythservicecontracts/datacontracts/recRule.h
- index 820cfc8..1d32f36 100644
- --- a/mythtv/libs/libmythservicecontracts/datacontracts/recRule.h
- +++ b/mythtv/libs/libmythservicecontracts/datacontracts/recRule.h
- @@ -6,6 +6,7 @@
- #include "serviceexp.h"
- #include "datacontracthelper.h"
- +#include "recording.h"
- namespace DTC
- {
- @@ -17,6 +18,9 @@ class SERVICE_PUBLIC RecRule : public QObject
- Q_OBJECT
- Q_CLASSINFO( "version" , "1.11" );
- + // MOC requires the DTC namespace to be used
- + Q_ENUMS( DTC::RecordingInfo::RecordingDupMethodEnum )
- +
- Q_PROPERTY( int Id READ Id WRITE setId )
- Q_PROPERTY( int ParentId READ ParentId WRITE setParentId )
- Q_PROPERTY( bool Inactive READ Inactive WRITE setInactive )
- @@ -44,7 +48,7 @@ class SERVICE_PUBLIC RecRule : public QObject
- Q_PROPERTY( uint PreferredInput READ PreferredInput WRITE setPreferredInput )
- Q_PROPERTY( int StartOffset READ StartOffset WRITE setStartOffset )
- Q_PROPERTY( int EndOffset READ EndOffset WRITE setEndOffset )
- - Q_PROPERTY( QString DupMethod READ DupMethod WRITE setDupMethod )
- + Q_PROPERTY( DTC::RecordingInfo::RecordingDupMethodEnum DupMethod READ DupMethod WRITE setDupMethod )
- Q_PROPERTY( QString DupIn READ DupIn WRITE setDupIn )
- Q_PROPERTY( uint Filter READ Filter WRITE setFilter )
- @@ -95,7 +99,7 @@ class SERVICE_PUBLIC RecRule : public QObject
- PROPERTYIMP ( uint , PreferredInput )
- PROPERTYIMP ( int , StartOffset )
- PROPERTYIMP ( int , EndOffset )
- - PROPERTYIMP ( QString , DupMethod )
- + PROPERTYIMP_ENUM( RecordingInfo::RecordingDupMethodEnum , DupMethod )
- PROPERTYIMP ( QString , DupIn )
- PROPERTYIMP ( uint , Filter )
- PROPERTYIMP ( QString , RecProfile )
- @@ -137,6 +141,7 @@ class SERVICE_PUBLIC RecRule : public QObject
- m_PreferredInput( 0 ),
- m_StartOffset ( 0 ),
- m_EndOffset ( 0 ),
- + m_DupMethod ( RecordingInfo::eDupCheckNone ),
- m_Filter ( 0 ),
- m_AutoExpire ( false ),
- m_MaxEpisodes ( 0 ),
- diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/recording.h b/mythtv/libs/libmythservicecontracts/datacontracts/recording.h
- index 8691f86..9d62600 100644
- --- a/mythtv/libs/libmythservicecontracts/datacontracts/recording.h
- +++ b/mythtv/libs/libmythservicecontracts/datacontracts/recording.h
- @@ -38,33 +38,54 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
- Q_PROPERTY( QString StorageGroup READ StorageGroup WRITE setStorageGroup DESIGNABLE SerializeDetails )
- Q_PROPERTY( int RecType READ RecType WRITE setRecType DESIGNABLE SerializeDetails )
- Q_PROPERTY( int DupInType READ DupInType WRITE setDupInType DESIGNABLE SerializeDetails )
- - Q_PROPERTY( int DupMethod READ DupMethod WRITE setDupMethod DESIGNABLE SerializeDetails )
- + Q_PROPERTY( RecordingDupMethodEnum DupMethod READ DupMethod WRITE setDupMethod DESIGNABLE SerializeDetails )
- Q_PROPERTY( int EncoderId READ EncoderId WRITE setEncoderId DESIGNABLE SerializeDetails )
- Q_PROPERTY( QString EncoderName READ EncoderName WRITE setEncoderName DESIGNABLE SerializeDetails )
- Q_PROPERTY( QString Profile READ Profile WRITE setProfile DESIGNABLE SerializeDetails )
- + public:
- +
- /*
- 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 )
- */
- + Q_ENUMS( RecordingDupMethodEnum )
- +
- + #ifdef false
- + // Needed for translated enum descriptions
- + QT_TRANSLATE_NOOP( "Enums", "RecordingInfo.RecordingDupMethodEnum.eDupCheckNone" )
- + QT_TRANSLATE_NOOP( "Enums", "RecordingInfo.RecordingDupMethodEnum.eDupCheckSub" )
- + QT_TRANSLATE_NOOP( "Enums", "RecordingInfo.RecordingDupMethodEnum.eDupCheckDesc" )
- + QT_TRANSLATE_NOOP( "Enums", "RecordingInfo.RecordingDupMethodEnum.eDupCheckSubDesc" )
- + QT_TRANSLATE_NOOP( "Enums", "RecordingInfo.RecordingDupMethodEnum.eDupCheckSubThenDesc" )
- + #endif
- +
- + typedef enum
- + {
- + eDupCheckNone = 0x01,
- + eDupCheckSub = 0x02,
- + eDupCheckDesc = 0x04,
- + eDupCheckSubDesc = 0x06,
- + eDupCheckSubThenDesc = 0x08
- + } RecordingDupMethodEnum;
- +
- PROPERTYIMP ( uint , RecordedId )
- PROPERTYIMP_ENUM( RecStatusType , Status )
- PROPERTYIMP ( int , Priority )
- PROPERTYIMP ( QDateTime , StartTs )
- PROPERTYIMP ( QDateTime , EndTs )
- -
- +
- PROPERTYIMP ( int , RecordId )
- PROPERTYIMP ( QString , RecGroup )
- PROPERTYIMP ( QString , StorageGroup)
- PROPERTYIMP ( QString , PlayGroup )
- PROPERTYIMP_ENUM( RecordingType , RecType )
- PROPERTYIMP_ENUM( RecordingDupInType , DupInType )
- - PROPERTYIMP_ENUM( RecordingDupMethodType , DupMethod )
- + PROPERTYIMP_ENUM( RecordingDupMethodEnum , DupMethod )
- PROPERTYIMP ( int , EncoderId )
- PROPERTYIMP ( QString , EncoderName )
- PROPERTYIMP ( QString , Profile )
- @@ -86,7 +107,7 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
- m_RecordId ( 0 ),
- m_RecType ( kNotRecording ),
- m_DupInType ( kDupsInRecorded ),
- - m_DupMethod ( kDupCheckNone ),
- + m_DupMethod ( eDupCheckNone ),
- m_EncoderId ( 0 ),
- m_SerializeDetails( true )
- {
- @@ -121,6 +142,7 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
- Q_DECLARE_METATYPE( DTC::RecordingInfo )
- Q_DECLARE_METATYPE( DTC::RecordingInfo* )
- +Q_DECLARE_METATYPE( DTC::RecordingInfo::RecordingDupMethodEnum )
- namespace DTC
- {
- @@ -128,6 +150,8 @@ inline void RecordingInfo::InitializeCustomTypes()
- {
- qRegisterMetaType< RecordingInfo >();
- qRegisterMetaType< RecordingInfo* >();
- +
- + qRegisterMetaType< RecordingInfo::RecordingDupMethodEnum >();
- }
- }
- diff --git a/mythtv/libs/libmythservicecontracts/services/dvrServices.h b/mythtv/libs/libmythservicecontracts/services/dvrServices.h
- index d2b8bd8..768777b 100644
- --- a/mythtv/libs/libmythservicecontracts/services/dvrServices.h
- +++ b/mythtv/libs/libmythservicecontracts/services/dvrServices.h
- @@ -155,7 +155,7 @@ class SERVICE_PUBLIC DvrServices : public Service //, public QScriptable ???
- uint PreferredInput,
- int StartOffset,
- int EndOffset,
- - QString DupMethod,
- + DTC::RecordingInfo::RecordingDupMethodEnum DupMethod,
- QString DupIn,
- uint Filter,
- QString RecProfile,
- @@ -197,7 +197,7 @@ class SERVICE_PUBLIC DvrServices : public Service //, public QScriptable ???
- uint PreferredInput,
- int StartOffset,
- int EndOffset,
- - QString DupMethod,
- + DTC::RecordingInfo::RecordingDupMethodEnum DupMethod,
- QString DupIn,
- uint Filter,
- QString RecProfile,
- diff --git a/mythtv/programs/mythbackend/services/dvr.cpp b/mythtv/programs/mythbackend/services/dvr.cpp
- index bc34d8a..a5ae8f5 100644
- --- a/mythtv/programs/mythbackend/services/dvr.cpp
- +++ b/mythtv/programs/mythbackend/services/dvr.cpp
- @@ -662,7 +662,7 @@ uint Dvr::AddRecordSchedule (
- uint nPreferredInput,
- int nStartOffset,
- int nEndOffset,
- - QString sDupMethod,
- + DTC::RecordingInfo::RecordingDupMethodEnum eDupMethod,
- QString sDupIn,
- uint nFilter,
- QString sRecProfile,
- @@ -692,8 +692,8 @@ uint Dvr::AddRecordSchedule (
- if (sSearchType.isEmpty())
- sSearchType = "none";
- - if (sDupMethod.isEmpty())
- - sDupMethod = "subtitleanddescription";
- +//// if (sDupMethod.isEmpty())
- +//// sDupMethod = "subtitleanddescription";
- if (sDupIn.isEmpty())
- sDupIn = "all";
- @@ -709,7 +709,7 @@ uint Dvr::AddRecordSchedule (
- rule.m_type = recTypeFromString(sType);
- rule.m_searchType = searchTypeFromString(sSearchType);
- - rule.m_dupMethod = dupMethodFromString(sDupMethod);
- + rule.m_dupMethod = (RecordingDupMethodType)eDupMethod;
- rule.m_dupIn = dupInFromString(sDupIn);
- if (sRecProfile.isEmpty())
- @@ -802,7 +802,7 @@ bool Dvr::UpdateRecordSchedule ( uint nRecordId,
- uint nPreferredInput,
- int nStartOffset,
- int nEndOffset,
- - QString sDupMethod,
- + DTC::RecordingInfo::RecordingDupMethodEnum eDupMethod,
- QString sDupIn,
- uint nFilter,
- QString sRecProfile,
- @@ -841,15 +841,15 @@ bool Dvr::UpdateRecordSchedule ( uint nRecordId,
- if (sSearchType.isEmpty())
- sSearchType = "none";
- - if (sDupMethod.isEmpty())
- - sDupMethod = "subtitleanddescription";
- +// if (sDupMethod.isEmpty())
- +// sDupMethod = "subtitleanddescription";
- if (sDupIn.isEmpty())
- sDupIn = "all";
- pRule.m_type = recTypeFromString(sType);
- pRule.m_searchType = searchTypeFromString(sSearchType);
- - pRule.m_dupMethod = dupMethodFromString(sDupMethod);
- + pRule.m_dupMethod = (RecordingDupMethodType)eDupMethod;
- pRule.m_dupIn = dupInFromString(sDupIn);
- if (sRecProfile.isEmpty())
- diff --git a/mythtv/programs/mythbackend/services/dvr.h b/mythtv/programs/mythbackend/services/dvr.h
- index d272cdc..074774e 100644
- --- a/mythtv/programs/mythbackend/services/dvr.h
- +++ b/mythtv/programs/mythbackend/services/dvr.h
- @@ -121,7 +121,7 @@ class Dvr : public DvrServices
- uint PreferredInput,
- int StartOffset,
- int EndOffset,
- - QString DupMethod,
- + DTC::RecordingInfo::RecordingDupMethodEnum DupMethod,
- QString DupIn,
- uint Filter,
- QString RecProfile,
- @@ -163,7 +163,7 @@ class Dvr : public DvrServices
- uint PreferredInput,
- int StartOffset,
- int EndOffset,
- - QString DupMethod,
- + DTC::RecordingInfo::RecordingDupMethodEnum DupMethod,
- QString DupIn,
- uint Filter,
- QString RecProfile,
- diff --git a/mythtv/programs/mythbackend/services/serviceUtil.cpp b/mythtv/programs/mythbackend/services/serviceUtil.cpp
- index 4d655d5..8ab2d10 100644
- --- a/mythtv/programs/mythbackend/services/serviceUtil.cpp
- +++ b/mythtv/programs/mythbackend/services/serviceUtil.cpp
- @@ -268,7 +268,7 @@ void FillRecRuleInfo( DTC::RecRule *pRecRule,
- pRecRule->setPreferredInput ( pRule->m_prefInput );
- pRecRule->setStartOffset ( pRule->m_startOffset );
- pRecRule->setEndOffset ( pRule->m_endOffset );
- - pRecRule->setDupMethod ( toRawString(pRule->m_dupMethod) );
- + pRecRule->setDupMethod ( (DTC::RecordingInfo::RecordingDupMethodEnum)pRule->m_dupMethod );
- pRecRule->setDupIn ( toRawString(pRule->m_dupIn) );
- pRecRule->setFilter ( pRule->m_filter );
- pRecRule->setRecProfile ( pRule->m_recProfile );
Add Comment
Please, Sign In to add comment