Append subtitle (with episode name) to title for epg and recordings.

tsp · Dec 21, 2011 · 6ff36ce · 6ff36ce
1 parent db2a6e8
commit 6ff36ce
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythProgramInfo.cpp b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythProgramInfo.cpp
@@ -38,6 +38,15 @@ MythProgramInfo::MythProgramInfo(cmyth_proginfo_t cmyth_proginfo)
     return retval;
   }
 
+  CStdString MythProgramInfo::Subtitle()
+  {
+    CStdString retval;
+    char* subtitle=CMYTH->ProginfoSubtitle(*m_proginfo_t);
+    retval=subtitle;
+    CMYTH->RefRelease(subtitle);
+    return retval;
+  }
+
   CStdString MythProgramInfo::Path()
    {
     CStdString retval;
@@ -151,4 +160,4 @@ MythProgramInfo::MythProgramInfo(cmyth_proginfo_t cmyth_proginfo)
     if(m_proginfo_t==NULL)
       return true;
     return *m_proginfo_t==NULL;
-  }
+  }
diff --git a/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythProgramInfo.h b/xbmc/pvrclients/mythtv-cmyth/cppmyth/MythProgramInfo.h
@@ -16,6 +16,7 @@ class MythProgramInfo
   MythProgramInfo(cmyth_proginfo_t cmyth_proginfo);
   CStdString ProgramID();
   CStdString Title();
+  CStdString Subtitle();
   CStdString Path();
   CStdString Description();
   CStdString ChannelName();
@@ -33,4 +34,4 @@ class MythProgramInfo
   bool IsNull();
 private:
   boost::shared_ptr< MythPointer< cmyth_proginfo_t > > m_proginfo_t;
-};
+};
diff --git a/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.cpp b/xbmc/pvrclients/mythtv-cmyth/pvrclient-mythtv.cpp
@@ -325,7 +325,11 @@ PVR_ERROR PVRClientMythTV::GetEPGForChannel(PVR_HANDLE handle, const PVR_CHANNEL
       tag.endTime=it->endtime;
       tag.iChannelNumber=it->channum;
       tag.startTime=it->starttime;
-      tag.strTitle=it->title;
+      CStdString title=it->title;
+      CStdString subtitle=it->subtitle;
+      if (!subtitle.IsEmpty())
+        title+=": " + subtitle;
+      tag.strTitle=title;
       tag.strPlot= it->description;
       /*unsigned int seriesid=atoi(it->seriesid);
       if(seriesid!=0)
@@ -423,6 +427,9 @@ PVR_ERROR PVRClientMythTV::GetRecordings(PVR_HANDLE handle)
       CStdString plot=it->second.Description();
       CStdString path=it->second.Path();
       CStdString title=it->second.Title();
+      CStdString subtitle=it->second.Subtitle();
+      if (!subtitle.IsEmpty())
+        title+=": " + subtitle;
 
       tag.strChannelName=chanName;
       tag.strPlot=plot;
@@ -1069,4 +1076,4 @@ PVR_ERROR PVRClientMythTV::CallMenuHook(const PVR_MENUHOOK &menuhook)
     wnd.Open();
   }
   return PVR_ERROR_NO_ERROR;
-}
+}