move OSD menu from main menu to plugin setup menu

dynamite.c

@@ -10,9 +10,9 @@
 #include "menu.h"
 #include "monitor.h"
 
-static const char *VERSION        = "0.0.6a";
+static const char *VERSION        = "0.0.6b";
 static const char *DESCRIPTION    = "attach/detach devices on the fly";
-static const char *MAINMENUENTRY  = "dynamite";
+static const char *MAINMENUENTRY  = NULL;
 
 class cDynamiteDvbDeviceProbe : public cDvbDeviceProbe {
 private:
@@ -240,13 +240,13 @@ time_t cPluginDynamite::WakeupTime(void)
 cOsdObject *cPluginDynamite::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
-  return new cDynamiteMainMenu;
+  return NULL;
 }
 
 cMenuSetupPage *cPluginDynamite::SetupMenu(void)
 {
   // Return a setup menu in case the plugin supports one.
-  return NULL;
+  return new cDynamiteMainMenu;
 }
 
 bool cPluginDynamite::SetupParse(const char *Name, const char *Value)

menu.c

@@ -81,7 +81,6 @@ class cDynamiteMenuItem : public cOsdItem
 };
 
 cDynamiteMainMenu::cDynamiteMainMenu(void)
-:cOsdMenu("dynamite")
 {
   Add(new cDynamiteMenuItem(maList, "list attached devices"));
   Add(new cDynamiteMenuItem(maScan, "scan for new DVB devices", false));
@@ -95,6 +94,10 @@ cDynamiteMainMenu::~cDynamiteMainMenu(void)
 {
 }
 
+void cDynamiteMainMenu::Store(void)
+{
+}
+
 eOSState cDynamiteMainMenu::ProcessKey(eKeys Key)
 {
   cDynamiteMenuItem *item = dynamic_cast<cDynamiteMenuItem*>(Get(Current()));

menu.h

@@ -1,14 +1,15 @@
 #ifndef __DYNAMITEMENU_H
 #define __DYNAMITEMENU_H
 
-#include <vdr/osdbase.h>
+#include <vdr/menuitems.h>
 
 
-class cDynamiteMainMenu : public cOsdMenu
+class cDynamiteMainMenu : public cMenuSetupPage
 {
 private:
 
 protected:
+  virtual void Store(void);
 
 public:
   cDynamiteMainMenu(void);