got rid of the load error state forwarding

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

1 files changed, 4 insertions, 18 deletions

diff --git a/src/submenuprovider.cpp b/src/submenuprovider.cpp
index 9844abc..7ed8caa 100644
--- a/src/submenuprovider.cpp
+++ b/src/submenuprovider.cpp
@@ -4,20 +4,11 @@
 #include "pluginmenuitem.h"
 #include <vdr/plugin.h>
 
-SubMenuProvider::SubMenuProvider()
+SubMenuProvider::SubMenuProvider(MenuNode* rootMenu)
 {
-    //CreateTestMenus();
-    _oXmlMenu.LoadXmlMenu();
-    if(_oXmlMenu.getErrorStatus() == false)
-    {
-        _currentMenu = _oXmlMenu.GetMenuTree();
-        _someError=false;
-    }
-    else
-    {
-        _someError=true;
-    }
+     _currentMenu = _rootMenu = rootMenu;
 }
+
 MainMenuItemsList* SubMenuProvider::MainMenuItems()
 {
     ResetMainMenuItemsList();
@@ -44,7 +35,7 @@ void SubMenuProvider::ResetMainMenuItemsList()
 
 void SubMenuProvider::EnterRootMenu()
 {
-    _currentMenu = _oXmlMenu.GetMenuTree();
+    _currentMenu = _rootMenu;
 }
 
 void SubMenuProvider::EnterSubMenu(cOsdItem* item)
@@ -72,8 +63,3 @@ bool SubMenuProvider::LeaveSubMenu()
         return false;
     }
 }
-
-bool SubMenuProvider::getSomeError()
-{
-    return _someError;
-}