API: Add RecStart and RecEnd times to the program datacontract.

This data is what actually needs to be fed to all the content APIs to get a working item when you use pre/postroll.
MythTV · Apr 17, 2011 · 1650de3 · 1650de3
1 parent 04f5259
commit 1650de3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/mythtv/html/samples/recorded.qsp b/mythtv/html/samples/recorded.qsp
@@ -21,7 +21,7 @@
   <tr>
 <!-- These image loads are slow when you have a lot of recordings, so comment
      them out, but leave them in for reference for users.
-	<td><img src="/Content/GetPreviewImage?ChanId=<%= program.Channel.ChanId%>&StartTime=<%= ISODateString( program.StartTime ) %>" ></img></td>
+	<td><img src="/Content/GetPreviewImage?ChanId=<%= program.Channel.ChanId%>&StartTime=<%= ISODateString( program.RecStartTime ) %>" ></img></td>
 -->
 
 	<td><%= program.Title %><% if (program.SubTitle.length) os.write(" - " + program.SubTitle); %></td>

diff --git a/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h b/mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
@@ -153,16 +153,18 @@ class SERVICE_PUBLIC ChannelInfo : public QObject
 class SERVICE_PUBLIC Program : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO( "version"    , "1.0" );
+    Q_CLASSINFO( "version"    , "1.01" );
     Q_CLASSINFO( "defaultProp", "Description" );
 
-    Q_PROPERTY( QDateTime   StartTime    READ StartTime    WRITE setStartTime )
-    Q_PROPERTY( QDateTime   EndTime      READ EndTime      WRITE setEndTime   )
-    Q_PROPERTY( QString     Title        READ Title        WRITE setTitle     )
-    Q_PROPERTY( QString     SubTitle     READ SubTitle     WRITE setSubTitle  )
-    Q_PROPERTY( QString     Category     READ Category     WRITE setCategory  )
-    Q_PROPERTY( QString     CatType      READ CatType      WRITE setCatType   )
-    Q_PROPERTY( bool        Repeat       READ Repeat       WRITE setRepeat    )
+    Q_PROPERTY( QDateTime   StartTime    READ StartTime    WRITE setStartTime    )
+    Q_PROPERTY( QDateTime   EndTime      READ EndTime      WRITE setEndTime      )
+    Q_PROPERTY( QDateTime   RecStartTime READ RecStartTime WRITE setRecStartTime )
+    Q_PROPERTY( QDateTime   RecEndTime   READ RecEndTime   WRITE setRecEndTime   )
+    Q_PROPERTY( QString     Title        READ Title        WRITE setTitle        )
+    Q_PROPERTY( QString     SubTitle     READ SubTitle     WRITE setSubTitle     )
+    Q_PROPERTY( QString     Category     READ Category     WRITE setCategory     )
+    Q_PROPERTY( QString     CatType      READ CatType      WRITE setCatType      )
+    Q_PROPERTY( bool        Repeat       READ Repeat       WRITE setRepeat       )
 
     Q_PROPERTY( QString     SeriesId     READ SeriesId     WRITE setSeriesId     DESIGNABLE SerializeDetails )
     Q_PROPERTY( QString     ProgramId    READ ProgramId    WRITE setProgramId    DESIGNABLE SerializeDetails )
@@ -179,6 +181,8 @@ class SERVICE_PUBLIC Program : public QObject
 
     PROPERTYIMP    ( QDateTime   , StartTime    )
     PROPERTYIMP    ( QDateTime   , EndTime      )
+    PROPERTYIMP    ( QDateTime   , RecStartTime )
+    PROPERTYIMP    ( QDateTime   , RecEndTime   )
     PROPERTYIMP    ( QString     , Title        )
     PROPERTYIMP    ( QString     , SubTitle     )
     PROPERTYIMP    ( QString     , Category     )
@@ -242,6 +246,8 @@ class SERVICE_PUBLIC Program : public QObject
         {
             m_StartTime         = src.m_StartTime;
             m_EndTime           = src.m_EndTime;
+            m_RecStartTime      = src.m_RecStartTime;
+            m_RecEndTime        = src.m_RecEndTime;
             m_Title             = src.m_Title;
             m_SubTitle          = src.m_SubTitle;
             m_Category          = src.m_Category;

diff --git a/mythtv/programs/mythbackend/services/serviceUtil.cpp b/mythtv/programs/mythbackend/services/serviceUtil.cpp
@@ -36,13 +36,15 @@ void FillProgramInfo( DTC::Program *pProgram,
     if ((pProgram == NULL) || (pInfo == NULL))
         return;
 
-    pProgram->setStartTime(  pInfo->GetScheduledStartTime());
-    pProgram->setEndTime  (  pInfo->GetScheduledEndTime  ());
-    pProgram->setTitle    (  pInfo->GetTitle()             );
-    pProgram->setSubTitle (  pInfo->GetSubtitle()          );
-    pProgram->setCategory (  pInfo->GetCategory()          );
-    pProgram->setCatType  (  pInfo->GetCategoryType()      );
-    pProgram->setRepeat   (  pInfo->IsRepeat()             );
+    pProgram->setStartTime   (  pInfo->GetScheduledStartTime());
+    pProgram->setEndTime     (  pInfo->GetScheduledEndTime  ());
+    pProgram->setRecStartTime(  pInfo->GetRecordingStartTime());
+    pProgram->setRecEndTime  (  pInfo->GetRecordingEndTime  ());
+    pProgram->setTitle       (  pInfo->GetTitle()             );
+    pProgram->setSubTitle    (  pInfo->GetSubtitle()          );
+    pProgram->setCategory    (  pInfo->GetCategory()          );
+    pProgram->setCatType     (  pInfo->GetCategoryType()      );
+    pProgram->setRepeat      (  pInfo->IsRepeat()             );
 
     pProgram->setSerializeDetails( bDetails );