--- ../vdr-1.7.4.plain/./osdbase.c 2008-02-17 12:33:04.000000000 +0100 +++ ./osdbase.c 2009-02-15 15:45:59.000000000 +0100 @@ -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); --- ../vdr-1.7.4.plain/./menu.c 2009-01-24 16:05:43.000000000 +0100 +++ ./menu.c 2009-02-15 15:54:48.000000000 +0100 @@ -194,6 +194,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) @@ -371,6 +372,7 @@ cMenuChannels(void); ~cMenuChannels(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuChannels"; } }; cMenuChannels::cMenuChannels(void) @@ -780,6 +782,7 @@ cMenuTimers(void); virtual ~cMenuTimers(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimers"; } }; cMenuTimers::cMenuTimers(void) @@ -940,6 +943,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetEvent(event); + cStatus::MsgOsdSetEvent(event); if (event->Description()) cStatus::MsgOsdTextItem(event->Description()); } @@ -1062,6 +1066,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; @@ -1089,6 +1095,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; @@ -1229,6 +1247,8 @@ cMenuSchedule(void); virtual ~cMenuSchedule(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSchedule"; } + virtual void Display(void); }; cMenuSchedule::cMenuSchedule(void) @@ -1254,6 +1274,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(); @@ -1496,6 +1528,7 @@ cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL); virtual ~cMenuCommands(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuCommands"; } }; cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters) @@ -1568,6 +1601,7 @@ cMenuCam(cCamSlot *CamSlot); virtual ~cMenuCam(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuCam"; } }; cMenuCam::cMenuCam(cCamSlot *CamSlot) @@ -1747,6 +1781,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) @@ -1762,6 +1797,7 @@ { cOsdMenu::Display(); DisplayMenu()->SetRecording(recording); + cStatus::MsgOsdSetRecording(recording); if (recording->Info()->Description()) cStatus::MsgOsdTextItem(recording->Info()->Description()); } @@ -2156,6 +2192,7 @@ cMenuSetupOSD(void); virtual ~cMenuSetupOSD(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupOsd"; } }; cMenuSetupOSD::cMenuSetupOSD(void) @@ -2301,6 +2338,7 @@ public: cMenuSetupEPG(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupEpg"; } }; cMenuSetupEPG::cMenuSetupEPG(void) @@ -2396,6 +2434,7 @@ public: cMenuSetupDVB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupDvb"; } }; cMenuSetupDVB::cMenuSetupDVB(void) @@ -2525,6 +2564,7 @@ public: cMenuSetupLNB(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupLnb"; } }; cMenuSetupLNB::cMenuSetupLNB(void) @@ -2605,6 +2645,7 @@ public: cMenuSetupCAM(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupCam"; } }; cMenuSetupCAM::cMenuSetupCAM(void) @@ -2768,6 +2809,7 @@ public: cMenuSetupPlugins(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetupPlugins"; } }; cMenuSetupPlugins::cMenuSetupPlugins(void) @@ -2817,6 +2859,7 @@ public: cMenuSetup(void); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuSetup"; } }; cMenuSetup::cMenuSetup(void) --- ../vdr-1.7.4.plain/./status.c 2008-02-16 15:46:31.000000000 +0100 +++ ./status.c 2009-02-15 15:49:19.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); +} --- ../vdr-1.7.4.plain/./menu.h 2008-02-10 17:01:53.000000000 +0100 +++ ./menu.h 2009-02-15 15:45:59.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 cMenuEditTimer : public cOsdMenu { @@ -43,6 +44,7 @@ cMenuEditTimer(cTimer *Timer, bool New = false); virtual ~cMenuEditTimer(); virtual eOSState ProcessKey(eKeys Key); + virtual const char* MenuKind() { return "MenuTimerEdit"; } }; class cMenuEvent : public cOsdMenu { @@ -52,6 +54,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 { @@ -68,6 +71,7 @@ cMenuMain(eOSState State = osUnknown); virtual eOSState ProcessKey(eKeys Key); static cOsdObject *PluginOsdObject(void); + virtual const char* MenuKind() { return "MenuMain"; } }; class cDisplayChannel : public cOsdObject { @@ -169,6 +173,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 { --- ../vdr-1.7.4.plain/./status.h 2008-02-16 16:00:33.000000000 +0100 +++ ./status.h 2009-02-15 15:48:49.000000000 +0100 @@ -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 --- ../vdr-1.7.4.plain/./recording.h 2009-01-24 16:24:19.000000000 +0100 +++ ./recording.h 2009-02-15 15:45:59.000000000 +0100 @@ -62,6 +62,7 @@ const char *ChannelName(void) const { return channelName; } 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; } --- ../vdr-1.7.4.plain/./osdbase.h 2007-11-03 15:50:52.000000000 +0100 +++ ./osdbase.h 2009-02-15 15:45:59.000000000 +0100 @@ -129,6 +129,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 --- ../vdr-1.7.4.plain/./menuitems.h 2008-04-12 14:03:59.000000000 +0200 +++ ./menuitems.h 2009-02-15 15:45:59.000000000 +0100 @@ -185,6 +185,7 @@ cMenuSetupPage(void); virtual eOSState ProcessKey(eKeys Key); void SetPlugin(cPlugin *Plugin); + const char* MenuKind() { return "MenuSetupPage"; } }; #endif //__MENUITEMS_H