diff -r b0b042ba9306 -r c8c771bbedc8 menu.c --- a/menu.c Thu May 13 17:20:18 2010 +0200 +++ b/menu.c Thu May 13 17:27:17 2010 +0200 @@ -203,6 +203,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) @@ -379,6 +380,7 @@ cMenuChannels(void); ~cMenuChannels(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuChannels"; } }; cMenuChannels::cMenuChannels(void) @@ -1086,6 +1088,7 @@ cMenuTimers(void); virtual ~cMenuTimers(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimers"; } }; cMenuTimers::cMenuTimers(void) @@ -1246,6 +1249,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetEvent(event); + cStatus::MsgOsdSetEvent(event); if (event->Description()) cStatus::MsgOsdTextItem(event->Description()); } @@ -1368,6 +1372,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; @@ -1395,6 +1401,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; @@ -1535,6 +1553,8 @@ cMenuSchedule(void); virtual ~cMenuSchedule(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSchedule"; } + virtual void Display(void); }; cMenuSchedule::cMenuSchedule(void) @@ -1560,6 +1580,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(); @@ -1915,6 +1947,7 @@ cMenuCam(cCamSlot *CamSlot); virtual ~cMenuCam(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuCam"; } }; cMenuCam::cMenuCam(cCamSlot *CamSlot) @@ -2094,6 +2127,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) @@ -2109,6 +2143,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetRecording(recording); + cStatus::MsgOsdSetRecording(recording); if (recording->Info()->Description()) cStatus::MsgOsdTextItem(recording->Info()->Description()); } @@ -2505,6 +2540,7 @@ cMenuSetupOSD(void); virtual ~cMenuSetupOSD(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupOsd"; } }; cMenuSetupOSD::cMenuSetupOSD(void) @@ -2645,6 +2681,7 @@ public: cMenuSetupEPG(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupEpg"; } }; cMenuSetupEPG::cMenuSetupEPG(void) @@ -2740,6 +2777,7 @@ public: cMenuSetupDVB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupDvb"; } }; cMenuSetupDVB::cMenuSetupDVB(void) @@ -2869,6 +2907,7 @@ public: cMenuSetupLNB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupLnb"; } }; cMenuSetupLNB::cMenuSetupLNB(void) @@ -2949,6 +2988,7 @@ public: cMenuSetupCAM(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupCam"; } }; cMenuSetupCAM::cMenuSetupCAM(void) @@ -3124,6 +3164,7 @@ public: cMenuSetupPlugins(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupPlugins"; } }; cMenuSetupPlugins::cMenuSetupPlugins(void) @@ -3173,6 +3214,7 @@ public: cMenuSetup(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetup"; } }; cMenuSetup::cMenuSetup(void) diff -r b0b042ba9306 -r c8c771bbedc8 menu.h --- a/menu.h Thu May 13 17:20:18 2010 +0200 +++ b/menu.h Thu May 13 17:27:17 2010 +0200 @@ -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 { @@ -84,6 +85,7 @@ cMenuEditTimer(cTimer *Timer, bool New = false); virtual ~cMenuEditTimer(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimerEdit"; } }; class cMenuEvent : public cOsdMenu { @@ -93,6 +95,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 { @@ -109,6 +112,7 @@ cMenuMain(eOSState State = osUnknown); virtual eOSState ProcessKey(eKeys Key); static cOsdObject *PluginOsdObject(void); + virtual const char* MenuKind() { return "MenuMain"; } }; class cDisplayChannel : public cOsdObject { @@ -210,6 +214,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 -r b0b042ba9306 -r c8c771bbedc8 menuitems.h --- a/menuitems.h Thu May 13 17:20:18 2010 +0200 +++ b/menuitems.h Thu May 13 17:27:17 2010 +0200 @@ -198,6 +198,7 @@ cMenuSetupPage(void); virtual eOSState ProcessKey(eKeys Key); void SetPlugin(cPlugin *Plugin); + const char* MenuKind() { return "MenuSetupPage"; } }; #endif //__MENUITEMS_H diff -r b0b042ba9306 -r c8c771bbedc8 osdbase.c --- a/osdbase.c Thu May 13 17:20:18 2010 +0200 +++ b/osdbase.c Thu May 13 17:27:17 2010 +0200 @@ -97,6 +97,7 @@ free(status); displayMenu->Clear(); cStatus::MsgOsdClear(); + cStatus::MsgOsdMenuDestroy(); if (!--displayMenuCount) DELETENULL(displayMenu); } @@ -202,6 +203,7 @@ displayMenu->SetMessage(mtStatus, NULL); displayMenu->Clear(); cStatus::MsgOsdClear(); + cStatus::MsgOsdMenuDisplay(MenuKind()); displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX displayMenu->SetTitle(title); cStatus::MsgOsdTitle(title); diff -r b0b042ba9306 -r c8c771bbedc8 osdbase.h --- a/osdbase.h Thu May 13 17:20:18 2010 +0200 +++ b/osdbase.h Thu May 13 17:27:17 2010 +0200 @@ -131,6 +131,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 -r b0b042ba9306 -r c8c771bbedc8 recording.h --- a/recording.h Thu May 13 17:20:18 2010 +0200 +++ b/recording.h Thu May 13 17:27:17 2010 +0200 @@ -67,6 +67,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 -r b0b042ba9306 -r c8c771bbedc8 status.c --- a/status.c Thu May 13 17:20:18 2010 +0200 +++ b/status.c Thu May 13 17:27:17 2010 +0200 @@ -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 -r b0b042ba9306 -r c8c771bbedc8 status.h --- a/status.h Thu May 13 17:20:18 2010 +0200 +++ b/status.h Thu May 13 17:27:17 2010 +0200 @@ -80,6 +80,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(); @@ -101,6 +112,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