setup-0.3.1-zulu-edition

logread |grep setup
Feb  7 12:23:01 (none) user.err vdr: [14346] starting plugin: setup
Feb  7 12:23:03 (none) user.err vdr: [14346] starting plugin: setup
Feb  7 12:24:07 (none) user.err vdr: [14346] stopping plugin: setup
Feb  7 12:24:17 (none) user.err vdr: [16275] loading plugin: /usr/vdr/plugins/libvdr-setup.so.1.5.14
Feb  7 12:24:17 (none) user.err vdr: [16275] loading plugin: /usr/vdr/plugins/libvdr-setup.so.1.5.14
Feb  7 12:24:17 (none) user.err vdr: [16275] loading /etc/vdr/setup.conf
Feb  7 12:24:20 (none) user.err vdr: [16275] initializing plugin: setup (0.3.1-zulu-edition): VDR-Setup Erweiterung
Feb  7 12:24:20 (none) user.err vdr: [16275] initializing plugin: setup (0.3.1-zulu-edition): VDR-Setup Erweiterung
Feb  7 12:24:22 (none) user.err vdr: [16275] starting plugin: setup
Feb  7 12:24:24 (none) user.err vdr: [16275] starting plugin: setup

<menus>
        <menu name="VDR-Einstellungen">
            <menu name="OSD" help1="Einstellungen zum On Screen Display" help2="setup_osd.hlp" system="OSD" />
            <menu name="EPG" help1="Einstellungen zum Electronic Prgramming Guide" help2="setup_epg.hlp" system="EPG" />
            <menu name="DVB" help1="Einstellungen zur DVB-Karte" help2="setup_dvb.hlp" system="DVB" />
            <menu name="LNB" help2="setup_lnb.hlp" system="LNB" />
            <menu name="CICAM" help2="setup_cicam.hlp" system="CICAM" />
            <menu name="Aufnahme" help2="setup_record.hlp" system="Record" />
            <menu name="Wiedergabe" help2="setup_replay.hlp" system="Replay" />
            <menu name="Sonstiges" help2="setup_misc.hlp" system="Misc" />
            <menu name="LiveBuffer" system="LiveBuffer" />
            <menu name="Edit VDR-Menü" help1="VDR Menü bearbeiten" help2="setup_editmenu.hlp" system="VDRMenu" />

easyVDR:/usr/local/src/VDR# make plugins
Plugin setup:
make[1]: Entering directory `/usr/local/src/vdr-1.5.14/PLUGINS/src/setup-0.3.1-zulu-edition'
Extracting class definitions from VDR's menu.c for standard Setup
make[1]: Leaving directory `/usr/local/src/vdr-1.5.14/PLUGINS/src/setup-0.3.1-zulu-edition'
make[1]: Entering directory `/usr/local/src/vdr-1.5.14/PLUGINS/src/setup-0.3.1-zulu-edition'
make[1]: *** Keine Regel vorhanden, um das Target »tinystr.h«,
  benötigt von »setup.o«, zu erstellen.  Schluss.
make[1]: Leaving directory `/usr/local/src/vdr-1.5.14/PLUGINS/src/setup-0.3.1-zulu-edition'


*** failed plugins: setup

diff -uart setup-0.3.1-zulu-edition/config.c setup-0.3.1-zulu-edition_pf/config.c
--- setup-0.3.1-zulu-edition/config.c   2008-01-30 12:01:34.000000000 +0100
+++ setup-0.3.1-zulu-edition_pf/config.c        2008-04-11 13:35:23.000000000 +0200
@@ -38,6 +38,7 @@
   _xmlDoc = TiXmlDocument( fname );
   _bootLinux = NULL;
   _returnValue  = NULL;
+  _filter = NULL;


   childLockCode = NULL; //will not be freed hold only reference to data
 }
@@ -76,6 +77,11 @@
         else
            _bootLinux = Util::Strdupnew(tmp);


+        if ((tmp = root->Attribute("filter")) == NULL)
+           _filter = Util::Strdupnew("");
+        else
+           _filter = Util::Strdupnew(tmp);
+
         if ((tmp = root->Attribute("VDRlibDir")) == NULL)
            _libDir = Util::Strdupnew("/usr/lib/vdr/plugins");
         else
@@ -255,12 +261,19 @@
         const char *active = elem->Attribute("active");
         const char *param = elem->Attribute("param");
         const char *protect = elem->Attribute("protected");
+        const char *depends = elem->Attribute("depends");
         bool  b_active;
         bool  b_protect;
+        bool  b_depends = true;
+
+        if (depends != NULL && strcmp( depends , _filter) != 0 ) {
+                b_depends = false;
+        }
+
         if (protect == NULL || Util::isBool(protect, b_protect) == false)
            b_protect = false;


-        if (name != NULL && info != NULL && active != NULL && Util::isBool(active, b_active))
+        if (name != NULL && info != NULL && active != NULL && Util::isBool(active, b_active) && b_depends)
            _activePlugins.AddPlugin(name, param,  info, b_active, b_protect);
         else
            ok = false;
diff -uart setup-0.3.1-zulu-edition/menus.c setup-0.3.1-zulu-edition_pf/menus.c
--- setup-0.3.1-zulu-edition/menus.c    2006-03-05 10:47:25.000000000 +0100
+++ setup-0.3.1-zulu-edition_pf/menus.c 2008-04-11 13:44:01.000000000 +0200
@@ -358,7 +358,8 @@
                 const char* system  = elem->Attribute("system");
                 const char* help1   = elem->Attribute("help1");
                 const char* help2   = elem->Attribute("help2");
-                if( name != NULL )
+                const char* depends   = elem->Attribute("depends");
+                if( name != NULL && (depends == NULL || strcmp( depends, _filter ) )
                 {
                     Menu * m = new Menu(name);


@@ -382,9 +383,11 @@
             {   const char* command = elem->Attribute("command");
                 const char* help1   = elem->Attribute("help1");
                 const char* help2   = elem->Attribute("help2");
+                const char* depends   = elem->Attribute("depends");
+
                 MenuEntry * e = new MenuEntry();


-                if( e != NULL && (ok=e->AddEntry(xmlNode))== true )
+                if( e != NULL && (ok=e->AddEntry(xmlNode))== true && ( depends == NULL || strcmp( depends, _filter) )
                 {
                     e->SetCommand(command);
                     e->SetHelp1(help1);