rename udev property dynamite_ignore to dynamite_attach (think positive)v0.0.6

3 files changed, 16 insertions, 6 deletions

diff --git a/HISTORY b/HISTORY
index 68fbf5e..1debf83 100644
--- a/HISTORY
+++ b/HISTORY
@@ -129,3 +129,9 @@ VDR Plugin 'dynamite' Revision History
 2011-03-23: Version 0.0.5o
 
 - fix bug in GetAudioChannelDevice (endless loop)
+
+2011-03-24: Version 0.0.6
+
+- scan with udev for dvb devices on startup to bridge gaps in the adapter numbers
+- add udev property "dynamite_attach" to keep devices from being attached
+- add udev property "dynamite_instanceid" to associate the devices to different vdr instances
diff --git a/README b/README
index 8f0c839..8d1e490 100644
--- a/README
+++ b/README
@@ -215,7 +215,7 @@ Add a rule which sets with ENV{dynamite_timeout}="10" the needed timeout value.
 
 example for udev rule:
 ACTION=="add", SUBSYSTEM=="dvb", ENV{DVB_DEVICE_TYPE}=="frontend" \
-  , ENV{dynamite_ignore}="no" \
+  , ENV{dynamite_attach}="yes" \
   , ENV{dynamite_instanceid}="0" \
   , ENV{dynamite_timeout}="10" \
   , ENV{dynamite_timeout_handler_arg}="%k"
@@ -226,8 +226,11 @@ is not present the devpath is provided as argument, with which the device was at
 
 Udev Properties
 ---------------
-dynamite_ignore
-    "yes", "y", "1": don't attach this device
+Attaching of devices can be controlled with some udev device properties which can be
+set by a udev rule (see example above).
+
+dynamite_attach
+    "no", "n", "0", "ignore": don't attach this device, every other string will be like "yes"
 
 dynamite_instanceid
     n: attach only at vdr with matching instance id
diff --git a/dynamicdevice.c b/dynamicdevice.c
index 5ed2276..9aeccb9 100644
--- a/dynamicdevice.c
+++ b/dynamicdevice.c
@@ -137,9 +137,10 @@ eDynamicDeviceReturnCode cDynamicDevice::AttachDevice(const char *DevPath)
   if (dev != NULL) {
      bool ignore = false;
      const char *tmp;
-     if (((tmp = dev->GetPropertyValue("dynamite_ignore")) != NULL)
-     && ((strcasecmp(tmp, "yes") == 0) || (strcasecmp(tmp, "y") == 0) || (strcmp(tmp, "1") == 0))) {
-        isyslog("dynamite: udev says ignore %s", DevPath);
+     if (((tmp = dev->GetPropertyValue("dynamite_attach")) != NULL)
+      && ((strcmp(tmp, "0") == 0) || (strcasecmp(tmp, "n") == 0)
+       || (strcasecmp(tmp, "no") == 0) || (strcasecmp(tmp, "ignore") == 0))) {
+        isyslog("dynamite: udev says don't attach %s", DevPath);
         ignore = true;
         }
      else if (((tmp = dev->GetPropertyValue("dynamite_instanceid")) != NULL) && isnumber(tmp)) {