summaryrefslogtreecommitdiff
path: root/src/menuorg.cpp
diff options
context:
space:
mode:
authorsvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2007-08-26 13:11:41 +0000
committersvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2007-08-26 13:11:41 +0000
commit8c827812bd737d24f6366481854a5e5d5578501c (patch)
tree3526d2f3b5890e41a10e76504c34fe1035e6f39e /src/menuorg.cpp
parent075b5783c77d442c7a9a7315e6696d223784b3fc (diff)
downloadvdr-plugin-menuorg-8c827812bd737d24f6366481854a5e5d5578501c.tar.gz
vdr-plugin-menuorg-8c827812bd737d24f6366481854a5e5d5578501c.tar.bz2
made menuconfiguration reparsable from loaded dom
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6002 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
Diffstat (limited to 'src/menuorg.cpp')
-rw-r--r--src/menuorg.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index 0b0111d..b764f07 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -44,11 +44,14 @@ MenuOrgPlugin::MenuOrgPlugin(void)
// VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
_customMenuShouldBeActive = true;
_unconfiguredPluginsShouldBeIncluded = true;
+ _subMenuProvider = NULL;
+ _menuConfiguration = NULL;
}
MenuOrgPlugin::~MenuOrgPlugin()
{
delete _subMenuProvider;
+ delete _menuConfiguration;
}
const char* MenuOrgPlugin::Version(void)
@@ -103,12 +106,12 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
bool MenuOrgPlugin::Initialize(void)
{
- MenuConfiguration menuConfiguration;
-
if(configFile.empty())
configFile = (string) ConfigDirectory() + "/menuorg.xml";
- MenuNode* menu = menuConfiguration.LoadMenu(configFile);
+ _menuConfiguration = new MenuConfiguration(configFile);
+
+ MenuNode* menu = _menuConfiguration->MenuTree();
if (menu)
{
_subMenuProvider = new MainMenuItemsProvider(menu);