diff -ruN 1.7.41_17/menu.c 1.7.41_18/menu.c --- 1.7.41_17/menu.c 2013-03-18 21:44:35.000000000 +0100 +++ 1.7.41_18/menu.c 2013-03-18 21:45:35.000000000 +0100 @@ -168,6 +168,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) @@ -353,6 +354,7 @@ cMenuChannels(void); ~cMenuChannels(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuChannels"; } }; cMenuChannels::cMenuChannels(void) @@ -1080,6 +1082,7 @@ cMenuTimers(void); virtual ~cMenuTimers(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimers"; } }; cMenuTimers::cMenuTimers(void) @@ -1242,6 +1245,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetEvent(event); + cStatus::MsgOsdSetEvent(event); if (event->Description()) cStatus::MsgOsdTextItem(event->Description()); } @@ -1371,6 +1375,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; @@ -1399,6 +1405,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; @@ -1539,6 +1557,8 @@ cMenuSchedule(void); virtual ~cMenuSchedule(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSchedule"; } + virtual void Display(void); }; cMenuSchedule::cMenuSchedule(void) @@ -1565,6 +1585,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(); @@ -1929,6 +1961,7 @@ cMenuCam(cCamSlot *CamSlot); virtual ~cMenuCam(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuCam"; } }; cMenuCam::cMenuCam(cCamSlot *CamSlot) @@ -2116,6 +2149,7 @@ cMenuRecording(const cRecording *Recording, bool WithButtons = false); virtual void Display(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuRecording"; } }; cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons) @@ -2132,6 +2166,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetRecording(recording); + cStatus::MsgOsdSetRecording(recording); if (recording->Info()->Description()) cStatus::MsgOsdTextItem(recording->Info()->Description()); } @@ -2710,6 +2745,7 @@ cMenuSetupOSD(void); virtual ~cMenuSetupOSD(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupOsd"; } }; cMenuSetupOSD::cMenuSetupOSD(void) @@ -2863,6 +2899,7 @@ public: cMenuSetupEPG(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupEpg"; } }; cMenuSetupEPG::cMenuSetupEPG(void) @@ -2960,6 +2997,7 @@ public: cMenuSetupDVB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupDvb"; } }; cMenuSetupDVB::cMenuSetupDVB(void) @@ -3106,6 +3144,7 @@ public: cMenuSetupLNB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupLnb"; } }; cMenuSetupLNB::cMenuSetupLNB(void) @@ -3211,6 +3250,7 @@ public: cMenuSetupCAM(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupCam"; } }; cMenuSetupCAM::cMenuSetupCAM(void) @@ -3398,6 +3438,7 @@ public: cMenuSetupPlugins(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupPlugins"; } }; cMenuSetupPlugins::cMenuSetupPlugins(void) @@ -3453,6 +3494,7 @@ public: cMenuSetup(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetup"; } }; cMenuSetup::cMenuSetup(void) diff -ruN 1.7.41_17/menu.h 1.7.41_18/menu.h --- 1.7.41_17/menu.h 2013-03-18 21:44:35.000000000 +0100 +++ 1.7.41_18/menu.h 2013-03-18 21:45:35.000000000 +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 { @@ -67,6 +68,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 { @@ -85,6 +87,7 @@ cMenuEditTimer(cTimer *Timer, bool New = false); virtual ~cMenuEditTimer(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimerEdit"; } }; class cMenuEvent : public cOsdMenu { @@ -94,6 +97,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); virtual eOSState ProcessKey(eKeys Key); static cOsdObject *PluginOsdObject(void); + virtual const char* MenuKind() { return "MenuMain"; } }; class cDisplayChannel : public cOsdObject { @@ -214,6 +219,7 @@ cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false); ~cMenuRecordings(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuRecordings"; } }; class cRecordControl { diff -ruN 1.7.41_17/menuitems.h 1.7.41_18/menuitems.h --- 1.7.41_17/menuitems.h 2012-03-13 12:19:11.000000000 +0100 +++ 1.7.41_18/menuitems.h 2013-03-18 21:45:35.000000000 +0100 @@ -209,6 +209,7 @@ cMenuSetupPage(void); virtual eOSState ProcessKey(eKeys Key); void SetPlugin(cPlugin *Plugin); + const char* MenuKind() { return "MenuSetupPage"; } }; #endif //__MENUITEMS_H diff -ruN 1.7.41_17/osdbase.c 1.7.41_18/osdbase.c --- 1.7.41_17/osdbase.c 2013-03-18 21:44:35.000000000 +0100 +++ 1.7.41_18/osdbase.c 2013-03-18 21:45:35.000000000 +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 1.7.41_17/osdbase.h 1.7.41_18/osdbase.h --- 1.7.41_17/osdbase.h 2013-03-18 21:44:35.000000000 +0100 +++ 1.7.41_18/osdbase.h 2013-03-18 21:45:35.000000000 +0100 @@ -139,6 +139,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 1.7.41_17/recording.h 1.7.41_18/recording.h --- 1.7.41_17/recording.h 2013-03-18 21:44:35.000000000 +0100 +++ 1.7.41_18/recording.h 2013-03-18 21:45:35.000000000 +0100 @@ -68,6 +68,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 1.7.41_17/status.c 1.7.41_18/status.c --- 1.7.41_17/status.c 2012-03-07 15:17:24.000000000 +0100 +++ 1.7.41_18/status.c 2013-03-18 21:45:35.000000000 +0100 @@ -124,3 +124,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 1.7.41_17/status.h 1.7.41_18/status.h --- 1.7.41_17/status.h 2012-03-07 15:16:57.000000000 +0100 +++ 1.7.41_18/status.h 2013-03-18 21:45:35.000000000 +0100 @@ -81,6 +81,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(); @@ -102,6 +113,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