Merge branch 'master' into weatherfc

3 files changed, 29 insertions, 0 deletions

diff --git a/skinskeleton/xmlfiles/displaymenudetailrecording.xml b/skinskeleton/xmlfiles/displaymenudetailrecording.xml
index 0fa3a21..23d1417 100644
--- a/skinskeleton/xmlfiles/displaymenudetailrecording.xml
+++ b/skinskeleton/xmlfiles/displaymenudetailrecording.xml
@@ -25,6 +25,9 @@
     {bannerpath}              path of banner
     {recimgavailable}         true if a recording image is available in the recording path
     {recimgpath}              path of rec image
+    {recchannelname}          name of channel from which was recorded
+    {recchannelid}            id of channel from which was recorded
+    {recchannelnumber}        number of channel from which was recorded
     -->
     <detailheader>
     </detailheader>
@@ -51,6 +54,9 @@
     {recordingbitrate}        bitrate of recording (in MBit/s)
     {recordingformat}         format of recording (TS / PS)
     {searchtimer}             name of accordign searchtimer (if available)
+    {recchannelname}          name of channel from which was recorded
+    {recchannelid}            id of channel from which was recorded
+    {recchannelnumber}        number of channel from which was recorded
     
     {recimg1avaialble}        true if first recording image is available
     {recimg2avaialble}        true if first recording image is available
diff --git a/views/displaymenudetailview.c b/views/displaymenudetailview.c
index 527db7e..81040ff 100644
--- a/views/displaymenudetailview.c
+++ b/views/displaymenudetailview.c
@@ -413,7 +413,12 @@ void cDisplayMenuDetailView::LoadRecordingInformation(void) {
     cChannel *channel = Channels.GetByChannelID(Info->ChannelID());
     if (channel) {
         stringTokens.insert(pair<string,string>("recchannelname", channel->Name()));
+        stringTokens.insert(pair<string,string>("recchannelid", *channel->GetChannelID().ToString()));
         intTokens.insert(pair<string,int>("recchannelnumber", channel->Number()));
+    } else {
+        stringTokens.insert(pair<string,string>("recchannelname", ""));
+        stringTokens.insert(pair<string,string>("recchannelid", ""));
+        intTokens.insert(pair<string,int>("recchannelnumber", 0));
     }
 
     if (index) {
@@ -735,6 +740,16 @@ void cDisplayMenuDetailView::DrawHeader(void) {
                 headerIntTokens.insert(pair<string,int>("durationeventhours", duration / 60));
                 headerStringTokens.insert(pair<string,string>("durationeventminutes", *cString::sprintf("%.2d", duration%60)));
             }
+            cChannel *channel = Channels.GetByChannelID(info->ChannelID());
+            if (channel) {
+                headerStringTokens.insert(pair<string,string>("recchannelname", channel->Name()));
+                headerStringTokens.insert(pair<string,string>("recchannelid", *channel->GetChannelID().ToString()));
+                headerIntTokens.insert(pair<string,int>("recchannelnumber", channel->Number()));
+            } else {
+                headerStringTokens.insert(pair<string,string>("recchannelname", ""));
+                headerStringTokens.insert(pair<string,string>("recchannelid", ""));
+                headerIntTokens.insert(pair<string,int>("recchannelnumber", 0));
+            }
         } else {
             headerStringTokens.insert(pair<string,string>("shorttext", ""));
             int recDuration = recording->LengthInSeconds();
@@ -747,6 +762,9 @@ void cDisplayMenuDetailView::DrawHeader(void) {
             headerIntTokens.insert(pair<string,int>("durationevent", 0));
             headerIntTokens.insert(pair<string,int>("durationeventhours", 0));
             headerStringTokens.insert(pair<string,string>("durationeventminutes", ""));
+            headerStringTokens.insert(pair<string,string>("recchannelname", ""));
+            headerStringTokens.insert(pair<string,string>("recchannelid", ""));
+            headerIntTokens.insert(pair<string,int>("recchannelnumber", 0));
         }
 
         string recImage = "";
diff --git a/views/displaymenuview.c b/views/displaymenuview.c
index 1487ce1..1f6c69f 100644
--- a/views/displaymenuview.c
+++ b/views/displaymenuview.c
@@ -628,6 +628,11 @@ bool cDisplayMenuSchedulesView::DrawHeader(void) {
         string channelID = *(channel->GetChannelID().ToString());
         stringTokens.insert(pair<string,string>("channelid", channelID));
         intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
+    } else {
+        stringTokens.insert(pair<string,string>("channelnumber", ""));
+        stringTokens.insert(pair<string,string>("channelname", ""));
+        stringTokens.insert(pair<string,string>("channelid", ""));
+        intTokens.insert(pair<string, int>("channellogoexists", 0));        
     }
     bool hasIcon = false;
     string icon = imgCache->GetIconName(menuTitle, cat);