Added EnterRootMenu()

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5665 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

3 files changed, 29 insertions, 8 deletions

diff --git a/src/submenuprovider.cpp b/src/submenuprovider.cpp
index b76c635..4ea1401 100644
--- a/src/submenuprovider.cpp
+++ b/src/submenuprovider.cpp
@@ -59,6 +59,11 @@ void SubMenuProvider::ResetMainMenuItemsList()
     _currentMainMenuItems.clear(); 
 }
 
+void SubMenuProvider::EnterRootMenu()
+{
+    _currentMenu = _oXmlMenu.GetMenuTree();
+}
+
 void SubMenuProvider::EnterSubMenu(cOsdItem* item)
 {
     for(unsigned int itemIndex=0; itemIndex < _currentMainMenuItems.size(); itemIndex++)
diff --git a/src/submenuprovider.h b/src/submenuprovider.h
index bb5c055..2f7ae56 100644
--- a/src/submenuprovider.h
+++ b/src/submenuprovider.h
@@ -18,6 +18,7 @@ class SubMenuProvider: public ISubMenuProvider
     public:
         SubMenuProvider();
         virtual MainMenuItemsList* MainMenuItems();
+        virtual void EnterRootMenu();
         virtual void EnterSubMenu(cOsdItem* item);
         virtual bool LeaveSubMenu();
 
diff --git a/vdr-patch/opt-37_submenu.dpatch b/vdr-patch/opt-37_submenu.dpatch
index ea9f50d..826dc8b 100755
--- a/vdr-patch/opt-37_submenu.dpatch
+++ b/vdr-patch/opt-37_submenu.dpatch
@@ -4,8 +4,8 @@
 
 @DPATCH@
 diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c
---- vdr-1.4.7~/menu.c	2007-07-28 12:12:30.000000000 +0200
-+++ vdr-1.4.7/menu.c	2007-07-28 12:12:31.000000000 +0200
+--- vdr-1.4.7~/menu.c	2007-07-28 15:20:41.000000000 +0200
++++ vdr-1.4.7/menu.c	2007-07-28 15:20:41.000000000 +0200
 @@ -31,6 +31,7 @@
  #include "vdrttxtsubshooks.h"
  #include "dvbsub.h"
@@ -14,7 +14,21 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c
  
  #define MAXWAIT4EPGINFO   3 // seconds
  #define MODETIMEOUT       3 // seconds
-@@ -3084,6 +3085,29 @@
+@@ -3057,6 +3058,13 @@
+   cancelEditingItem = NULL;
+   stopRecordingItem = NULL;
+   recordControlsState = 0;
++
++  SubMenuPatch::ISubMenuProvider* subMenuProvider;
++
++  if (cPluginManager::CallFirstService("SubMenuPatch-v0.1::SubMenuProvider", &subMenuProvider)) {
++    subMenuProvider->EnterRootMenu();
++    }
++
+   Set();
+ 
+   // Initial submenus:
+@@ -3084,6 +3092,29 @@
    Clear();
    SetTitle("VDR");
    SetHasHotkeys();
@@ -44,7 +58,7 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c
  
    // Basic menu items:
  
-@@ -3111,6 +3135,8 @@
+@@ -3111,6 +3142,8 @@
    if (Commands.Count())
       Add(new cOsdItem(hk(tr("Commands")),  osCommands));
  
@@ -53,7 +67,7 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c
    Update(true);
  
    Display();
-@@ -3238,6 +3264,35 @@
+@@ -3238,6 +3271,35 @@
                           state = osEnd;
                         }
                         break;
@@ -91,8 +105,8 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c
                 case kRed:    if (!HadSubMenu)
 diff -urNad vdr-1.4.7~/submenupatch.h vdr-1.4.7/submenupatch.h
 --- vdr-1.4.7~/submenupatch.h	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.4.7/submenupatch.h	2007-07-28 12:13:57.000000000 +0200
-@@ -0,0 +1,57 @@
++++ vdr-1.4.7/submenupatch.h	2007-07-28 15:23:23.000000000 +0200
+@@ -0,0 +1,58 @@
 +/*
 + * vdr-submenu - A plugin for the Linux Video Disk Recorder
 + * Copyright (c) 2007 Tobias Grimm <vdr@e-tobi.net>
@@ -141,8 +155,9 @@ diff -urNad vdr-1.4.7~/submenupatch.h vdr-1.4.7/submenupatch.h
 +class ISubMenuProvider
 +{
 +    public:
-+        virtual ~ISubMenuProvider();
++        virtual ~ISubMenuProvider() {};
 +        virtual  MainMenuItemsList* MainMenuItems() = 0;
++        virtual  void EnterRootMenu() = 0;
 +        virtual  void EnterSubMenu(cOsdItem* item) = 0;
 +        virtual  bool LeaveSubMenu() = 0;
 +};