diff -ruN vdr-2.1.4_16/menu.c vdr-2.1.4_17/menu.c --- vdr-2.1.4_16/menu.c 2014-01-26 14:27:28.844164593 +0100 +++ vdr-2.1.4_17/menu.c 2014-01-26 14:28:46.600214212 +0100 @@ -167,6 +167,7 @@ public: cMenuEditChannel(cChannel *Channel, bool New = false); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuEditChannel"; } }; cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New) @@ -356,6 +357,7 @@ cMenuChannels(void); ~cMenuChannels(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuChannels"; } }; cMenuChannels::cMenuChannels(void) @@ -1097,6 +1099,7 @@ cMenuTimers(void); virtual ~cMenuTimers(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimers"; } }; cMenuTimers::cMenuTimers(void) @@ -1259,6 +1262,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetEvent(event); + cStatus::MsgOsdSetEvent(event); if (event->Description()) cStatus::MsgOsdTextItem(event->Description()); } @@ -1388,6 +1392,8 @@ static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; } static const cEvent *ScheduleEvent(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return now ? "MenuWhatsOnNow" : "MenuWhatsOnNext"; } + virtual void Display(void); }; int cMenuWhatsOn::currentChannel = 0; @@ -1416,6 +1422,18 @@ SetHelpKeys(); } +void cMenuWhatsOn::Display(void) +{ + cOsdMenu::Display(); + + if (Count() > 0) { + int ni = 0; + for (cOsdItem *item = First(); item; item = Next(item)) { + cStatus::MsgOsdEventItem(((cMenuScheduleItem*)item)->event, item->Text(), ni++, Count()); + } + } +} + bool cMenuWhatsOn::Update(void) { bool result = false; @@ -1556,6 +1574,8 @@ cMenuSchedule(void); virtual ~cMenuSchedule(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSchedule"; } + virtual void Display(void); }; cMenuSchedule::cMenuSchedule(void) @@ -1582,6 +1602,18 @@ cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared } +void cMenuSchedule::Display(void) +{ + cOsdMenu::Display(); + + if (Count() > 0) { + int ni = 0; + for (cOsdItem *item = First(); item; item = Next(item)) { + cStatus::MsgOsdEventItem(((cMenuScheduleItem*)item)->event, item->Text(), ni++, Count()); + } + } +} + void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel *Channel) { Clear(); @@ -1946,6 +1978,7 @@ cMenuCam(cCamSlot *CamSlot); virtual ~cMenuCam(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuCam"; } }; cMenuCam::cMenuCam(cCamSlot *CamSlot) @@ -2436,6 +2469,7 @@ cMenuRecording(cRecording *Recording, bool WithButtons = false); virtual void Display(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuRecording"; } }; cMenuRecording::cMenuRecording(cRecording *Recording, bool WithButtons) @@ -2471,6 +2505,7 @@ } cOsdMenu::Display(); DisplayMenu()->SetRecording(recording); + cStatus::MsgOsdSetRecording(recording); if (recording->Info()->Description()) cStatus::MsgOsdTextItem(recording->Info()->Description()); } @@ -2918,6 +2953,7 @@ cMenuSetupOSD(void); virtual ~cMenuSetupOSD(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupOsd"; } }; cMenuSetupOSD::cMenuSetupOSD(void) @@ -3071,6 +3107,7 @@ public: cMenuSetupEPG(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupEpg"; } }; cMenuSetupEPG::cMenuSetupEPG(void) @@ -3168,6 +3205,7 @@ public: cMenuSetupDVB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupDvb"; } }; cMenuSetupDVB::cMenuSetupDVB(void) @@ -3314,6 +3352,7 @@ public: cMenuSetupLNB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupLnb"; } }; cMenuSetupLNB::cMenuSetupLNB(void) @@ -3428,6 +3467,7 @@ public: cMenuSetupCAM(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupCam"; } }; cMenuSetupCAM::cMenuSetupCAM(void) @@ -3615,6 +3655,7 @@ public: cMenuSetupPlugins(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupPlugins"; } }; cMenuSetupPlugins::cMenuSetupPlugins(void) @@ -3670,6 +3711,7 @@ public: cMenuSetup(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetup"; } }; cMenuSetup::cMenuSetup(void) diff -ruN vdr-2.1.4_16/menu.h vdr-2.1.4_17/menu.h --- vdr-2.1.4_16/menu.h 2014-01-26 14:27:28.732170283 +0100 +++ vdr-2.1.4_17/menu.h 2014-01-26 14:28:46.600214212 +0100 @@ -29,6 +29,7 @@ void SetText(const char *Text); virtual void Display(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuText"; } }; class cMenuFolder : public cOsdMenu { @@ -68,6 +69,7 @@ cMenuCommands(const char *Title, cList *Commands, const char *Parameters = NULL); virtual ~cMenuCommands(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuCommands"; } }; class cMenuEditTimer : public cOsdMenu { @@ -86,6 +88,7 @@ cMenuEditTimer(cTimer *Timer, bool New = false); virtual ~cMenuEditTimer(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimerEdit"; } }; class cMenuEvent : public cOsdMenu { @@ -95,6 +98,7 @@ cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false); virtual void Display(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuEvent"; } }; class cMenuMain : public cOsdMenu { @@ -111,6 +115,7 @@ cMenuMain(eOSState State = osUnknown, bool OpenSubMenus = false); virtual eOSState ProcessKey(eKeys Key); static cOsdObject *PluginOsdObject(void); + virtual const char* MenuKind() { return "MenuMain"; } }; class cDisplayChannel : public cOsdObject { @@ -224,6 +229,7 @@ cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false, const cRecordingFilter *Filter = NULL); ~cMenuRecordings(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuRecordings"; } static void SetPath(const char *Path); static void SetRecording(const char *FileName); }; diff -ruN vdr-2.1.4_16/menuitems.h vdr-2.1.4_17/menuitems.h --- vdr-2.1.4_16/menuitems.h 2013-05-24 12:19:55.000000000 +0200 +++ vdr-2.1.4_17/menuitems.h 2014-01-26 14:28:46.604214009 +0100 @@ -220,6 +220,7 @@ cMenuSetupPage(void); virtual eOSState ProcessKey(eKeys Key); void SetPlugin(cPlugin *Plugin); + const char* MenuKind() { return "MenuSetupPage"; } }; #endif //__MENUITEMS_H diff -ruN vdr-2.1.4_16/osdbase.c vdr-2.1.4_17/osdbase.c --- vdr-2.1.4_16/osdbase.c 2014-01-26 14:27:28.684172721 +0100 +++ vdr-2.1.4_17/osdbase.c 2014-01-26 14:28:46.604214009 +0100 @@ -106,6 +106,7 @@ free(status); displayMenu->Clear(); cStatus::MsgOsdClear(); + cStatus::MsgOsdMenuDestroy(); if (!--displayMenuCount) DELETENULL(displayMenu); } @@ -226,6 +227,7 @@ if (menuCategory != displayMenu->MenuCategory()) displayMenu->SetMenuCategory(menuCategory); displayMenuItems = displayMenu->MaxItems(); + cStatus::MsgOsdMenuDisplay(MenuKind()); displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX displayMenu->SetTitle(title); cStatus::MsgOsdTitle(title); diff -ruN vdr-2.1.4_16/osdbase.h vdr-2.1.4_17/osdbase.h --- vdr-2.1.4_16/osdbase.h 2014-01-26 14:27:28.672173331 +0100 +++ vdr-2.1.4_17/osdbase.h 2014-01-26 14:28:46.604214009 +0100 @@ -138,6 +138,7 @@ void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL); virtual void Display(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuUnknown"; } }; #endif //__OSDBASE_H diff -ruN vdr-2.1.4_16/recording.h vdr-2.1.4_17/recording.h --- vdr-2.1.4_16/recording.h 2014-01-01 13:45:18.000000000 +0100 +++ vdr-2.1.4_17/recording.h 2014-01-26 14:28:46.604214009 +0100 @@ -84,6 +84,7 @@ const cEvent *GetEvent(void) const { return event; } const char *Title(void) const { return event->Title(); } const char *ShortText(void) const { return event->ShortText(); } + tEventID EventID(void) const { return event->EventID(); } const char *Description(void) const { return event->Description(); } const cComponents *Components(void) const { return event->Components(); } const char *Aux(void) const { return aux; } diff -ruN vdr-2.1.4_16/status.c vdr-2.1.4_17/status.c --- vdr-2.1.4_16/status.c 2014-01-25 11:47:39.000000000 +0100 +++ vdr-2.1.4_17/status.c 2014-01-26 14:28:46.604214009 +0100 @@ -130,3 +130,32 @@ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle); } + +void cStatus::MsgOsdSetEvent(const cEvent* event) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->OsdSetEvent(event); +} + +void cStatus::MsgOsdSetRecording(const cRecording* recording) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->OsdSetRecording(recording); +} + +void cStatus::MsgOsdMenuDisplay(const char* kind) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->OsdMenuDisplay(kind); +} + +void cStatus::MsgOsdMenuDestroy() +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->OsdMenuDestroy(); +} +void cStatus::MsgOsdEventItem(const cEvent* Event, const char *Text, int Index, int Count) +{ + for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm)) + sm->OsdEventItem(Event, Text, Index, Count); +} diff -ruN vdr-2.1.4_16/status.h vdr-2.1.4_17/status.h --- vdr-2.1.4_16/status.h 2014-01-25 11:47:39.000000000 +0100 +++ vdr-2.1.4_17/status.h 2014-01-26 14:28:46.608213805 +0100 @@ -84,6 +84,17 @@ // The OSD displays the single line Text with the current channel information. virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {} // The OSD displays the given programme information. + virtual void OsdSetRecording(const cRecording* recording) {} + // The OSD displays the recording information. + virtual void OsdSetEvent(const cEvent* event) {} + // The OSD displays the event information. + virtual void OsdMenuDisplay(const char* kind) {} + // report menu creation + virtual void OsdMenuDestroy() {} + // report menu destruvtion + virtual void OsdEventItem(const cEvent* Event, const char *Text, int Index, int Count) {} + // The OSD displays the given single line Event as menu item at Index. + public: cStatus(void); virtual ~cStatus(); @@ -106,6 +117,11 @@ static void MsgOsdTextItem(const char *Text, bool Scroll = false); static void MsgOsdChannel(const char *Text); static void MsgOsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle); + static void MsgOsdSetEvent(const cEvent* event); + static void MsgOsdSetRecording(const cRecording* recording); + static void MsgOsdMenuDisplay(const char* kind); + static void MsgOsdMenuDestroy(); + static void MsgOsdEventItem(const cEvent* Event, const char *Text, int Index, int Count); }; #endif //__STATUS_H