From e13024a34d16bdb8fc848901315b8f1622784426 Mon Sep 17 00:00:00 2001
From: svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>
Date: Tue, 28 Aug 2007 12:51:02 +0000
Subject: config stuff for unconfiguredPluginsShouldBeIncluded

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6099 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
---
 src/menuconfiguration.cpp | 8 ++++++--
 src/menuconfiguration.h   | 3 ++-
 src/menuorg.cpp           | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index 0b02cec..86a8d8e 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -51,9 +51,10 @@ const string MenuConfiguration::_dtd =
   " execute CDATA #REQUIRED\n"
   " confirm (yes|no) #IMPLIED>";
 
-MenuConfiguration::MenuConfiguration(string menuFileName)
+MenuConfiguration::MenuConfiguration(string menuFileName, bool* unconfiguredPluginsShouldBeIncluded)
 {
     _configuration = NULL;
+    _unconfiguredPluginsShouldBeIncluded = unconfiguredPluginsShouldBeIncluded;
 
     try
     {
@@ -89,7 +90,10 @@ MenuNode* MenuConfiguration::MenuTree()
     {
         MenuNode* menuRoot = new MenuNode();
         CreateMenuTree(_configuration, menuRoot);
-        AddUnconfiguredPlugins(menuRoot);
+
+        if(_unconfiguredPluginsShouldBeIncluded)
+            AddUnconfiguredPlugins(menuRoot);
+
         return menuRoot;
     }
     else
diff --git a/src/menuconfiguration.h b/src/menuconfiguration.h
index fee3016..d9aa8a8 100644
--- a/src/menuconfiguration.h
+++ b/src/menuconfiguration.h
@@ -37,12 +37,13 @@ class MenuConfiguration
 {
     private:
         static const std::string _dtd;
+        bool* _unconfiguredPluginsShouldBeIncluded;
         std::vector<std::string> _configuredPlugins;
         xmlpp::Element* _configuration;
         xmlpp::DomParser _parser;
 
     public:
-        MenuConfiguration(std::string menuFileName);
+        MenuConfiguration(std::string menuFileName, bool* unconfiguredPluginsShouldBeIncluded);
         MenuNode* MenuTree();
         xmlpp::Element* Configuration();
 
diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index 60a5964..3e90024 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -115,7 +115,7 @@ bool MenuOrgPlugin::Initialize(void)
     if(configFile.empty())
         configFile = (string) ConfigDirectory() + "/menuorg.xml";
 
-    _menuConfiguration = new MenuConfiguration(configFile);
+    _menuConfiguration = new MenuConfiguration(configFile, &_unconfiguredPluginsShouldBeIncluded);
     // TODO need handling of unloadable config File here!!!
 
     _subMenuProvider = new MainMenuItemsProvider(*_menuConfiguration);
-- 
cgit v1.2.3