diff options
| author | svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-09-04 22:51:21 +0000 |
|---|---|---|
| committer | svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-09-04 22:51:21 +0000 |
| commit | 0f2b178de3999f4799a93f5d806718d8e08c650d (patch) | |
| tree | b78488d58c00dd14013620634ab5225ab96f6e46 | |
| parent | e0f70dd5d5cafd989d6a06eba7ac68379bc81e2e (diff) | |
| download | vdr-plugin-menuorg-0f2b178de3999f4799a93f5d806718d8e08c650d.tar.gz vdr-plugin-menuorg-0f2b178de3999f4799a93f5d806718d8e08c650d.tar.bz2 | |
fixed "ERROR: plugin '<no name given>' called cPlugin::ConfigDirectory(), which is not thread safe!" and some other LineItem stuff
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6130 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
| -rw-r--r-- | src/mainmenuitemsprovider.cpp | 2 | ||||
| -rw-r--r-- | src/menuconfiguration.cpp | 9 | ||||
| -rw-r--r-- | src/menuorg.cpp | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp index 594c342..ee62f3e 100644 --- a/src/mainmenuitemsprovider.cpp +++ b/src/mainmenuitemsprovider.cpp @@ -145,5 +145,5 @@ void MainMenuItemsProvider::ProcessSystemMenuNode(SystemMenuNode* node) void MainMenuItemsProvider::ProcessLineMenuNode(LineMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdLineItem(node->Text().c_str()); + _createdMenuItemDefinition = new OsdItemDefinition(new cOsdLineItem(node->Text().c_str())); } diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp index 94d95a9..6711738 100644 --- a/src/menuconfiguration.cpp +++ b/src/menuconfiguration.cpp @@ -35,8 +35,8 @@ using namespace xmlpp; using namespace std; const string MenuConfiguration::_dtd = - "<!ELEMENT menus ((menu | system | plugin | command)+)>\n" - "<!ELEMENT menu ((menu | system | plugin | command)+)>\n" + "<!ELEMENT menus ((menu | system | plugin | command | line)+)>\n" + "<!ELEMENT menu ((menu | system | plugin | command | line)+)>\n" "<!ATTLIST menu name CDATA #REQUIRED>\n" "<!ELEMENT system EMPTY>\n" "<!ATTLIST system\n" @@ -50,7 +50,10 @@ const string MenuConfiguration::_dtd = "<!ATTLIST command\n" " name CDATA #REQUIRED\n" " execute CDATA #REQUIRED\n" - " confirm (yes|no) #IMPLIED>"; + " confirm (yes|no) #IMPLIED>" + "<!ELEMENT line EMPTY>\n" + "<!ATTLIST line\n" + " title CDATA #IMPLIED>\n"; MenuConfiguration::MenuConfiguration(string menuFileName, bool unconfiguredPluginsShouldBeIncluded) { diff --git a/src/menuorg.cpp b/src/menuorg.cpp index 7d6e547..94b3c34 100644 --- a/src/menuorg.cpp +++ b/src/menuorg.cpp @@ -43,9 +43,8 @@ MenuOrgPlugin::MenuOrgPlugin(void) // Initialize any member variables here. // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT! - + _subMenuProvider = NULL; - _configFile = (string) ConfigDirectory() + "/menuorg.xml"; } MenuOrgPlugin::~MenuOrgPlugin() @@ -109,6 +108,7 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[]) bool MenuOrgPlugin::Initialize(void) { + _configFile = (string) ConfigDirectory() + "/menuorg.xml"; _menuConfiguration = new MenuConfiguration(_configFile, _pluginConfiguration.UnconfiguredPluginsInluded()); // TODO need handling of unloadable config File here!!! |