summaryrefslogtreecommitdiff
path: root/src/mainmenuitemsprovider.cpp
diff options
context:
space:
mode:
authorsvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2007-08-26 13:31:42 +0000
committersvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2007-08-26 13:31:42 +0000
commita1059732ffdca86f4dc01afe25788e8e428b9aec (patch)
treee4aef318f4d05f6f04d731c4a0efe5335c29d91b /src/mainmenuitemsprovider.cpp
parent8c827812bd737d24f6366481854a5e5d5578501c (diff)
downloadvdr-plugin-menuorg-a1059732ffdca86f4dc01afe25788e8e428b9aec.tar.gz
vdr-plugin-menuorg-a1059732ffdca86f4dc01afe25788e8e428b9aec.tar.bz2
reparse the menu each time the the root menu is requested
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6003 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
Diffstat (limited to 'src/mainmenuitemsprovider.cpp')
-rw-r--r--src/mainmenuitemsprovider.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp
index 6e0bb00..e0b6a7f 100644
--- a/src/mainmenuitemsprovider.cpp
+++ b/src/mainmenuitemsprovider.cpp
@@ -26,16 +26,17 @@
#include "pluginmenunode.h"
#include <vdr/plugin.h>
#include "childlock.h"
+#include "menuconfiguration.h"
-MainMenuItemsProvider::MainMenuItemsProvider(MenuNode* rootMenu)
+MainMenuItemsProvider::MainMenuItemsProvider(MenuConfiguration& menuConfiguration)
+ :_menuConfiguration(menuConfiguration)
{
- _currentMenu = _rootMenu = rootMenu;
+ EnterRootMenu();
}
MainMenuItemsProvider::~MainMenuItemsProvider()
{
ResetMainMenuItemsList();
- delete _rootMenu;
}
MenuItemDefinitions* MainMenuItemsProvider::MainMenuItems()
@@ -67,7 +68,7 @@ void MainMenuItemsProvider::ResetMainMenuItemsList()
void MainMenuItemsProvider::EnterRootMenu()
{
- _currentMenu = _rootMenu;
+ _currentMenu = _rootMenu = _menuConfiguration.MenuTree();;
}
void MainMenuItemsProvider::EnterSubMenu(cOsdItem* item)