fixed again display of channel in schedules header

HISTORY

@@ -142,4 +142,5 @@ Version 0.1.2
 - fixed two possible null pointer accesses in displaymenurootview
 - fixed bug that EPGSearch Favorites Menu was not displayed correctly,
   introduced "whatsonfavorites" Token in displaymenuschedules
-
+- fixed again display of channel in schedules header
+- added now and next in blackhole channels menu

displaymenu.c

@@ -100,13 +100,15 @@ bool cSDDisplayMenu::SetItemEvent(const cEvent *Event, int Index, bool Current,
         rootView->SetEpgSearchFavorite();
     }
     const cChannel *channel = Channel;
-    if (!channel) {
+    if (MenuCategory() == mcSchedule) {
-        channel = rootView->GetChannel();
+        if (!channel) {
+            channel = rootView->GetChannel();
+        } 
+        if (!channel && Event) {
+            channel = Channels.GetByChannelID(Event->ChannelID());
+        }
+        rootView->SetChannel(channel);
     }
-    if (!channel && Event) {
-        channel = Channels.GetByChannelID(Event->ChannelID());
-    }
-    rootView->SetChannel(channel);
 
     cDisplayMenuListView *list = rootView->GetListView();
     if (!list)

skins/blackhole/themes/default/globals.xml

@@ -40,6 +40,10 @@
             <trans lang="en_EN">Schedule</trans>
             <trans lang="de_DE">Programm</trans>
         </token>
+        <token name="tr(since)">
+            <trans lang="en_EN">since</trans>
+            <trans lang="de_DE">Seit</trans>
+        </token>
         <token name="tr(reruns)">
             <trans lang="en_EN">Reruns</trans>
             <trans lang="de_DE">Wiederholungen</trans>

skins/blackhole/xmlfiles/displaymenuchannels.xml

@@ -110,7 +110,9 @@
             </area>
             <areascroll mode="forthandback" orientation="vertical" delay="1000" scrollspeed="medium" x="55%" y="52%" width="45%" height="48%" layer="4">
                 <drawtext x="10" y="0" font="{semibold}" fontsize="15%" color="{clrWhite}" text="{tr(schedule)}:" />
-                <loop name="schedule" x="0" y="16%" orientation="vertical">
+                <drawtext x="10" y="16%" font="{regular}" width="{areawidth}-20" fontsize="12%" color="{clrWhite}" text="{tr(since)} {presenteventstart} - {presenteventtitle}" />
+                <drawtext x="10" y="26%" font="{regular}" width="{areawidth}-20" fontsize="12%" color="{clrWhite}" text="{nexteventstart} - {nexteventtitle}" />
+                <loop name="schedule" x="0" y="36%" orientation="vertical">
                     <drawtext x="10" font="{regular}" width="{areawidth}-20" fontsize="12%" color="{clrWhite}" text="{schedule[start]} - {schedule[title]}" />
                 </loop>
             </areascroll>

skins/blackhole/xmlfiles/displayreplay.xml

@@ -81,7 +81,7 @@
     {mediaheight}                       height of image in pixel
     {isbanner}                          true if image is a banner, false if it is a poster
     -->
-    <scrapercontent debug="true">
+    <scrapercontent>
         <area condition="{hasposter}" x="1%" y="15%" width="{areaheight}*0.7*{posterwidth}/{posterheight}" height="70%" layer="2">
             <drawimage imagetype="image" path="{posterpath}" x="0" y="0" width="100%" height="100%"/>
         </area>

views/displaymenurootview.c

@@ -324,6 +324,10 @@ void cDisplayMenuRootView::KeyInput(bool up, bool page) {
 }
 
 void cDisplayMenuRootView::Clear(void) {
+    if (view) {
+        view->ClearChannel();
+        view->ClearEpgSearchFavorite();
+    }
     if (listView) {
         listView->Clear();
     }

views/displaymenuview.h

@@ -18,7 +18,9 @@ public:
     void SetTitle(const char *title) {menuTitle = title; };
     virtual void SetChannel(const cChannel *channel) {};
     virtual const cChannel *GetChannel(void) { return NULL; };
+    virtual void ClearChannel(void) {};
     virtual void SetEpgSearchFavorite(void) {};
+    virtual void ClearEpgSearchFavorite(void) {};
     void SetButtonTexts(string *buttonTexts) { this->buttonTexts = buttonTexts; };
     bool DrawBackground(void);
     virtual bool DrawHeader(void);
@@ -59,7 +61,9 @@ public:
     virtual ~cDisplayMenuSchedulesView();
     void SetChannel(const cChannel *channel) { if (channel) this->channel = channel; };
     const cChannel *GetChannel(void) { return channel; };
+    void ClearChannel(void) { channel = NULL; };
     void SetEpgSearchFavorite(void) { isEpgSearchFavoritesMenu = true; };
+    void ClearEpgSearchFavorite(void) { isEpgSearchFavoritesMenu = false; };
     bool DrawHeader(void);
 };