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 /src/menuconfiguration.cpp | |
| 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
Diffstat (limited to 'src/menuconfiguration.cpp')
| -rw-r--r-- | src/menuconfiguration.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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) { |