diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h b/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h index 5a3586d67c7..3be3c28aa61 100644 --- a/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h +++ b/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h @@ -39,7 +39,7 @@ class Program; class SERVICE_PUBLIC ChannelInfo : public QObject { Q_OBJECT - Q_CLASSINFO( "version", "1.05" ); + Q_CLASSINFO( "version", "1.06" ); // We need to know the type that will ultimately be contained in // any QVariantList or QVariantMap. We do his by specifying @@ -182,7 +182,7 @@ class SERVICE_PUBLIC Program : public QObject Q_PROPERTY( QDateTime LastModified READ LastModified WRITE setLastModified DESIGNABLE SerializeDetails ) Q_PROPERTY( int ProgramFlags READ ProgramFlags WRITE setProgramFlags DESIGNABLE SerializeDetails ) Q_PROPERTY( QString FileName READ FileName WRITE setFileName DESIGNABLE SerializeDetails ) - Q_PROPERTY( QString Hostname READ Hostname WRITE setHostname DESIGNABLE SerializeDetails ) + Q_PROPERTY( QString HostName READ HostName WRITE setHostName DESIGNABLE SerializeDetails ) Q_PROPERTY( QDate Airdate READ Airdate WRITE setAirdate DESIGNABLE SerializeDetails ) Q_PROPERTY( QString Description READ Description WRITE setDescription DESIGNABLE SerializeDetails ) Q_PROPERTY( QString Inetref READ Inetref WRITE setInetref DESIGNABLE SerializeDetails ) @@ -210,7 +210,7 @@ class SERVICE_PUBLIC Program : public QObject PROPERTYIMP ( int , AudioProps ) PROPERTYIMP ( int , SubProps ) PROPERTYIMP ( QString , FileName ) - PROPERTYIMP ( QString , Hostname ) + PROPERTYIMP ( QString , HostName ) PROPERTYIMP ( QDate , Airdate ) PROPERTYIMP ( QString , Description ) PROPERTYIMP ( QString , Inetref ) @@ -284,7 +284,7 @@ class SERVICE_PUBLIC Program : public QObject m_AudioProps = src.m_AudioProps; m_SubProps = src.m_SubProps; m_FileName = src.m_FileName; - m_Hostname = src.m_Hostname; + m_HostName = src.m_HostName; m_Airdate = src.m_Airdate; m_Description = src.m_Description; m_Inetref = src.m_Inetref; diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/recording.h b/mythtv/libs/libmythservicecontracts/datacontracts/recording.h index 4da8ce9ed96..bb6e2fec176 100644 --- a/mythtv/libs/libmythservicecontracts/datacontracts/recording.h +++ b/mythtv/libs/libmythservicecontracts/datacontracts/recording.h @@ -35,21 +35,22 @@ namespace DTC class SERVICE_PUBLIC RecordingInfo : public QObject { Q_OBJECT - Q_CLASSINFO( "version", "1.0" ); + Q_CLASSINFO( "version", "1.01" ); Q_PROPERTY( int 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 ) - Q_PROPERTY( int RecordId READ RecordId WRITE setRecordId DESIGNABLE SerializeDetails ) - Q_PROPERTY( QString RecGroup READ RecGroup WRITE setRecGroup DESIGNABLE SerializeDetails ) - Q_PROPERTY( QString PlayGroup READ PlayGroup WRITE setPlayGroup 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( int EncoderId READ EncoderId WRITE setEncoderId DESIGNABLE SerializeDetails ) - Q_PROPERTY( QString Profile READ Profile WRITE setProfile DESIGNABLE SerializeDetails ) + Q_PROPERTY( int RecordId READ RecordId WRITE setRecordId DESIGNABLE SerializeDetails ) + Q_PROPERTY( QString RecGroup READ RecGroup WRITE setRecGroup DESIGNABLE SerializeDetails ) + Q_PROPERTY( QString PlayGroup READ PlayGroup WRITE setPlayGroup DESIGNABLE SerializeDetails ) + 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( int EncoderId READ EncoderId WRITE setEncoderId 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 @@ -67,6 +68,7 @@ class SERVICE_PUBLIC RecordingInfo : public QObject PROPERTYIMP ( int , RecordId ) PROPERTYIMP ( QString , RecGroup ) + PROPERTYIMP ( QString , StorageGroup) PROPERTYIMP ( QString , PlayGroup ) PROPERTYIMP_ENUM( RecordingType , RecType ) PROPERTYIMP_ENUM( RecordingDupInType , DupInType ) @@ -113,6 +115,7 @@ class SERVICE_PUBLIC RecordingInfo : public QObject m_EndTs = src.m_EndTs ; m_RecordId = src.m_RecordId ; m_RecGroup = src.m_RecGroup ; + m_StorageGroup = src.m_StorageGroup ; m_PlayGroup = src.m_PlayGroup ; m_RecType = src.m_RecType ; m_DupInType = src.m_DupInType ; diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h b/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h index 389f40a617b..96a6e949308 100644 --- a/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h +++ b/mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h @@ -36,7 +36,7 @@ namespace DTC class SERVICE_PUBLIC VideoMetadataInfo : public QObject { Q_OBJECT - Q_CLASSINFO( "version" , "1.01" ); + Q_CLASSINFO( "version" , "1.02" ); Q_PROPERTY( int Id READ Id WRITE setId ) Q_PROPERTY( QString Title READ Title WRITE setTitle ) @@ -60,7 +60,7 @@ class SERVICE_PUBLIC VideoMetadataInfo : public QObject Q_PROPERTY( bool Processed READ Processed WRITE setProcessed ) Q_PROPERTY( QString FileName READ FileName WRITE setFileName ) Q_PROPERTY( QString Hash READ Hash WRITE setHash ) - Q_PROPERTY( QString Host READ Host WRITE setHost ) + Q_PROPERTY( QString HostName READ HostName WRITE setHostName ) Q_PROPERTY( QString Coverart READ Coverart WRITE setCoverart ) Q_PROPERTY( QString Fanart READ Fanart WRITE setFanart ) Q_PROPERTY( QString Banner READ Banner WRITE setBanner ) @@ -89,7 +89,7 @@ class SERVICE_PUBLIC VideoMetadataInfo : public QObject PROPERTYIMP ( bool , Processed ) PROPERTYIMP ( QString , FileName ) PROPERTYIMP ( QString , Hash ) - PROPERTYIMP ( QString , Host ) + PROPERTYIMP ( QString , HostName ) PROPERTYIMP ( QString , Coverart ) PROPERTYIMP ( QString , Fanart ) PROPERTYIMP ( QString , Banner ) diff --git a/mythtv/programs/mythbackend/services/serviceUtil.cpp b/mythtv/programs/mythbackend/services/serviceUtil.cpp index 36902cee7e3..067c824a489 100644 --- a/mythtv/programs/mythbackend/services/serviceUtil.cpp +++ b/mythtv/programs/mythbackend/services/serviceUtil.cpp @@ -59,7 +59,7 @@ void FillProgramInfo( DTC::Program *pProgram, pProgram->setLastModified( pInfo->GetLastModifiedTime() ); pProgram->setProgramFlags( pInfo->GetProgramFlags() ); pProgram->setFileName ( pInfo->GetPathname() ); - pProgram->setHostname ( pInfo->GetHostname() ); + pProgram->setHostName ( pInfo->GetHostname() ); if (pInfo->GetOriginalAirDate().isValid()) pProgram->setAirdate( pInfo->GetOriginalAirDate() ); @@ -96,13 +96,14 @@ void FillProgramInfo( DTC::Program *pProgram, if (bDetails) { - pRecording->setRecordId ( pInfo->GetRecordingRuleID() ); - pRecording->setRecGroup ( pInfo->GetRecordingGroup() ); - pRecording->setPlayGroup( pInfo->GetPlaybackGroup() ); - pRecording->setRecType ( pInfo->GetRecordingRuleType() ); - pRecording->setDupInType( pInfo->GetDuplicateCheckSource() ); - pRecording->setDupMethod( pInfo->GetDuplicateCheckMethod() ); - pRecording->setEncoderId( pInfo->GetCardID() ); + pRecording->setRecordId ( pInfo->GetRecordingRuleID() ); + pRecording->setRecGroup ( pInfo->GetRecordingGroup() ); + pRecording->setPlayGroup ( pInfo->GetPlaybackGroup() ); + pRecording->setStorageGroup( pInfo->GetStorageGroup() ); + pRecording->setRecType ( pInfo->GetRecordingRuleType() ); + pRecording->setDupInType ( pInfo->GetDuplicateCheckSource() ); + pRecording->setDupMethod ( pInfo->GetDuplicateCheckMethod() ); + pRecording->setEncoderId ( pInfo->GetCardID() ); const RecordingInfo ri(*pInfo); pRecording->setProfile( ri.GetProgramRecordingProfile() ); diff --git a/mythtv/programs/mythbackend/services/video.cpp b/mythtv/programs/mythbackend/services/video.cpp index 84c7bed8e84..87affdaaa4d 100644 --- a/mythtv/programs/mythbackend/services/video.cpp +++ b/mythtv/programs/mythbackend/services/video.cpp @@ -96,7 +96,7 @@ DTC::VideoMetadataInfoList* Video::GetVideoList( bool bDescending, pVideoMetadataInfo->setProcessed(metadata->GetProcessed()); pVideoMetadataInfo->setFileName(metadata->GetFilename()); pVideoMetadataInfo->setHash(metadata->GetHash()); - pVideoMetadataInfo->setHost(metadata->GetHost()); + pVideoMetadataInfo->setHostName(metadata->GetHost()); pVideoMetadataInfo->setCoverart(metadata->GetCoverFile()); pVideoMetadataInfo->setFanart(metadata->GetFanart()); pVideoMetadataInfo->setBanner(metadata->GetBanner()); @@ -392,7 +392,7 @@ DTC::VideoMetadataInfo* Video::GetInfoFromMetadata( pVideoMetadataInfo->setProcessed(metadata->GetProcessed()); pVideoMetadataInfo->setFileName(metadata->GetFilename()); pVideoMetadataInfo->setHash(metadata->GetHash()); - pVideoMetadataInfo->setHost(metadata->GetHost()); + pVideoMetadataInfo->setHostName(metadata->GetHost()); pVideoMetadataInfo->setCoverart(metadata->GetCoverFile()); pVideoMetadataInfo->setFanart(metadata->GetFanart()); pVideoMetadataInfo->setBanner(metadata->GetBanner());