installation graphtft 0.0.16

hagen · 29. April 2007

Hi

ich versuche das graphtft plugin 0.0.16 mit einem vdr 1.4.6 zu installieren und laufe in die folgende Fehlermeldung beim Compilieren

Code

In file included from graphtft.h:17,
                 from graphtft.c:20:
display.h:333: error: `eOsdMenuKind' was not declared in this scope
display.h:333: error: syntax error before `)' token
make: *** [graphtft.o] Error 1

Wenn ich das wiki richtig verstehe brauche ich den VDR nur bei Versionen < 0.0.14 patchen

Welche Hilfe / Erklärung habe ich übersehen?

Hagen

peje · 1. Mai 2007

Nein, ohne patchen gehts nicht.
cu peje

devzero · 10. Juni 2007

Welchen Patch denn? Ich versuche die 0.2.0 gegen vdr 1.4.4 zu compilieren.. genau diese Meldung - im INSTALL steht dazu nichts.

devzero · 10. Juni 2007

Ich hab das mal aus dem Extensionspatch rausgepopelt - hierfür muss nur der LIEMIKUUTIO patch hinzugefügt sein.

Diff

diff -Nur vdr-1.3.44/include/vdr/menu.h vdr-1.3.44-graphtft/include/vdr/menu.h
--- vdr-1.3.44/include/vdr/menu.h	2006-02-27 12:26:35.022827750 +0100
+++ vdr-1.3.44-graphtft/include/vdr/menu.h	2007-06-10 14:12:04.000000000 +0200
@@ -29,6 +29,7 @@
   void SetText(const char *Text);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omText; }
   };
 
 class cMenuEditTimer : public cOsdMenu {
@@ -45,6 +46,7 @@
   cMenuEditTimer(cTimer *Timer, bool New = false);
   virtual ~cMenuEditTimer();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omTimerEdit; }
   };
 
 class cMenuEvent : public cOsdMenu {
@@ -54,6 +56,7 @@
   cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omEvent; }
   };
 
 class cMenuMain : public cOsdMenu {
@@ -72,6 +75,7 @@
   cMenuMain(eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
   static cOsdObject *PluginOsdObject(void);
+  virtual eOsdMenuKind MenuKind() { return omMain; }
   };
 
 class cDisplayChannel : public cOsdObject {
@@ -141,6 +145,7 @@
   cMenuCam(cCiMenu *CiMenu);
   virtual ~cMenuCam();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omCam; }
   };
 
 class cMenuCamEnquiry : public cOsdMenu {
@@ -153,6 +158,7 @@
   cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
   virtual ~cMenuCamEnquiry();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omCamEnquiry; }
   };
 
 cOsdObject *CamControl(void);
@@ -179,6 +185,7 @@
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
   ~cMenuRecordings();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omRecordings; }
   };
 
 class cRecordControl {
diff -Nur vdr-1.3.44/include/vdr/menuitems.h vdr-1.3.44-graphtft/include/vdr/menuitems.h
--- vdr-1.3.44/include/vdr/menuitems.h	2006-02-27 12:22:42.732310500 +0100
+++ vdr-1.3.44-graphtft/include/vdr/menuitems.h	2007-06-10 14:14:21.000000000 +0200
@@ -178,6 +178,7 @@
   cMenuSetupPage(void);
   virtual eOSState ProcessKey(eKeys Key);
   void SetPlugin(cPlugin *Plugin);
+  eOsdMenuKind MenuKind() { return omSetupPage; }
   };
 
 #endif //__MENUITEMS_H
diff -Nur vdr-1.3.44/include/vdr/osdbase.h vdr-1.3.44-graphtft/include/vdr/osdbase.h
--- vdr-1.3.44/include/vdr/osdbase.h	2006-02-27 12:22:42.732310500 +0100
+++ vdr-1.3.44-graphtft/include/vdr/osdbase.h	2007-06-10 14:19:50.000000000 +0200
@@ -46,6 +46,29 @@
                 osUser10,
               };
 
+enum eOsdMenuKind { omUnknown,
+                    omMain,
+                    omText,
+                    omTimerEdit,
+                    omEvent,
+                    omCam,
+                    omCamEnquiry,
+                    omSetupPage,
+                    omEditChannel,
+                    omChannels,
+                    omCommands,
+                    omTimers,
+                    omWhatsOn,
+                    omWhatsOnElse = omWhatsOn,
+                    omWhatsOnNow,
+                    omWhatsOnNext,
+                    omSchedule,
+                    omRecording,
+                    omRecordings,
+                    omRenameRecording,
+                    omSetup
+                  };
+
 class cOsdItem : public cListObject {
 private:
   char *text;
@@ -127,6 +150,7 @@
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omUnknown; }
   };
 
 #endif //__OSDBASE_H
diff -Nur vdr-1.3.44/include/vdr/status.h vdr-1.3.44-graphtft/include/vdr/status.h
--- vdr-1.3.44/include/vdr/status.h	2005-12-31 16:15:25.000000000 +0100
+++ vdr-1.3.44-graphtft/include/vdr/status.h	2007-06-10 14:24:42.000000000 +0200
@@ -67,6 +67,10 @@
                // 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 OsdMenuDisplay(eOsdMenuKind kind) {}
+               // report menu creation
+  virtual void OsdMenuDestroy() {}
+               // report menu destruction
 public:
   cStatus(void);
   virtual ~cStatus();
@@ -86,6 +90,8 @@
   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 MsgOsdMenuDisplay(const eOsdMenuKind kind);
+  static void MsgOsdMenuDestroy();
   };
 
 #endif //__STATUS_H
diff -Nur vdr-1.3.44/menu.c vdr-1.3.44-graphtft/menu.c
--- vdr-1.3.44/menu.c	2006-02-27 13:09:30.019755000 +0100
+++ vdr-1.3.44-graphtft/menu.c	2007-06-10 14:02:56.000000000 +0200
@@ -153,6 +153,7 @@
 public:
   cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omEditChannel; }
   };
 
 cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString)
@@ -390,6 +391,7 @@
   cMenuChannels(void);
   ~cMenuChannels();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omChannels; }
   };
 
 cMenuChannels::cMenuChannels(void)
@@ -799,6 +801,7 @@
   cMenuTimers(void);
   virtual ~cMenuTimers();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omTimers; }
   };
 
 cMenuTimers::cMenuTimers(void)
@@ -1074,6 +1077,7 @@
   static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; }
   static const cEvent *ScheduleEvent(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omWhatsOn; }
   };
 
 int cMenuWhatsOn::currentChannel = 0;
@@ -1238,6 +1242,7 @@
   cMenuSchedule(void);
   virtual ~cMenuSchedule();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omSchedule; }
   };
 
 cMenuSchedule::cMenuSchedule(void)
@@ -1509,6 +1514,7 @@
   cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
   virtual ~cMenuCommands();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omCommands; }
   };
 
 cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters)
@@ -1740,6 +1746,7 @@
   cMenuRecording(const cRecording *Recording, bool WithButtons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omRecording; }
 };
 
 cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
@@ -1860,6 +1867,7 @@
 public:
   cMenuRenameRecording(cRecording *Recording);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omRenameRecording; }
 };
 
 cMenuRenameRecording::cMenuRenameRecording(cRecording *Recording)
@@ -2728,6 +2736,7 @@
 public:
   cMenuSetupPlugins(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omSetup; }
   };
 
 cMenuSetupPlugins::cMenuSetupPlugins(void)
diff -Nur vdr-1.3.44/menu.h vdr-1.3.44-graphtft/menu.h
--- vdr-1.3.44/menu.h	2006-02-27 12:26:35.022827750 +0100
+++ vdr-1.3.44-graphtft/menu.h	2007-06-10 14:12:04.000000000 +0200
@@ -29,6 +29,7 @@
   void SetText(const char *Text);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omText; }
   };
 
 class cMenuEditTimer : public cOsdMenu {
@@ -45,6 +46,7 @@
   cMenuEditTimer(cTimer *Timer, bool New = false);
   virtual ~cMenuEditTimer();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omTimerEdit; }
   };
 
 class cMenuEvent : public cOsdMenu {
@@ -54,6 +56,7 @@
   cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omEvent; }
   };
 
 class cMenuMain : public cOsdMenu {
@@ -72,6 +75,7 @@
   cMenuMain(eOSState State = osUnknown);
   virtual eOSState ProcessKey(eKeys Key);
   static cOsdObject *PluginOsdObject(void);
+  virtual eOsdMenuKind MenuKind() { return omMain; }
   };
 
 class cDisplayChannel : public cOsdObject {
@@ -141,6 +145,7 @@
   cMenuCam(cCiMenu *CiMenu);
   virtual ~cMenuCam();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omCam; }
   };
 
 class cMenuCamEnquiry : public cOsdMenu {
@@ -153,6 +158,7 @@
   cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
   virtual ~cMenuCamEnquiry();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omCamEnquiry; }
   };
 
 cOsdObject *CamControl(void);
@@ -179,6 +185,7 @@
   cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
   ~cMenuRecordings();
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omRecordings; }
   };
 
 class cRecordControl {
diff -Nur vdr-1.3.44/menuitems.h vdr-1.3.44-graphtft/menuitems.h
--- vdr-1.3.44/menuitems.h	2006-02-27 12:22:42.732310500 +0100
+++ vdr-1.3.44-graphtft/menuitems.h	2007-06-10 14:14:21.000000000 +0200
@@ -178,6 +178,7 @@
   cMenuSetupPage(void);
   virtual eOSState ProcessKey(eKeys Key);
   void SetPlugin(cPlugin *Plugin);
+  eOsdMenuKind MenuKind() { return omSetupPage; }
   };
 
 #endif //__MENUITEMS_H
diff -Nur vdr-1.3.44/osdbase.c vdr-1.3.44-graphtft/osdbase.c
--- vdr-1.3.44/osdbase.c	2006-02-27 12:22:42.732310500 +0100
+++ vdr-1.3.44-graphtft/osdbase.c	2007-06-10 14:17:49.000000000 +0200
@@ -100,6 +100,7 @@
   free(status);
   displayMenu->Clear();
   cStatus::MsgOsdClear();
+  cStatus::MsgOsdMenuDestroy();
   if (!--displayMenuCount)
      DELETENULL(displayMenu);
 }
@@ -195,6 +196,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 -Nur vdr-1.3.44/osdbase.h vdr-1.3.44-graphtft/osdbase.h
--- vdr-1.3.44/osdbase.h	2006-02-27 12:22:42.732310500 +0100
+++ vdr-1.3.44-graphtft/osdbase.h	2007-06-10 14:19:50.000000000 +0200
@@ -46,6 +46,29 @@
                 osUser10,
               };
 
+enum eOsdMenuKind { omUnknown,
+                    omMain,
+                    omText,
+                    omTimerEdit,
+                    omEvent,
+                    omCam,
+                    omCamEnquiry,
+                    omSetupPage,
+                    omEditChannel,
+                    omChannels,
+                    omCommands,
+                    omTimers,
+                    omWhatsOn,
+                    omWhatsOnElse = omWhatsOn,
+                    omWhatsOnNow,
+                    omWhatsOnNext,
+                    omSchedule,
+                    omRecording,
+                    omRecordings,
+                    omRenameRecording,
+                    omSetup
+                  };
+
 class cOsdItem : public cListObject {
 private:
   char *text;
@@ -127,6 +150,7 @@
   void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
   virtual void Display(void);
   virtual eOSState ProcessKey(eKeys Key);
+  virtual eOsdMenuKind MenuKind() { return omUnknown; }
   };
 
 #endif //__OSDBASE_H
diff -Nur vdr-1.3.44/status.c vdr-1.3.44-graphtft/status.c
--- vdr-1.3.44/status.c	2005-12-31 16:10:10.000000000 +0100
+++ vdr-1.3.44-graphtft/status.c	2007-06-10 14:22:00.000000000 +0200
@@ -112,3 +112,15 @@
   for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
       sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle);
 }
+
+void cStatus::MsgOsdMenuDisplay(eOsdMenuKind 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();
+}
diff -Nur vdr-1.3.44/status.h vdr-1.3.44-graphtft/status.h
--- vdr-1.3.44/status.h	2005-12-31 16:15:25.000000000 +0100
+++ vdr-1.3.44-graphtft/status.h	2007-06-10 14:24:42.000000000 +0200
@@ -67,6 +67,10 @@
                // 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 OsdMenuDisplay(eOsdMenuKind kind) {}
+               // report menu creation
+  virtual void OsdMenuDestroy() {}
+               // report menu destruction
 public:
   cStatus(void);
   virtual ~cStatus();
@@ -86,6 +90,8 @@
   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 MsgOsdMenuDisplay(const eOsdMenuKind kind);
+  static void MsgOsdMenuDestroy();
   };
 
 #endif //__STATUS_H

Alles anzeigen

installation graphtft 0.0.16

Jetzt mitmachen!

Teilen