From ce2be684a0c22a3d9853e1d102c4a9c354ad04a8 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 8 Mar 2012 23:40:00 +0200
Subject: [PATCH] vdr-addon: vdr.start: fix softcam logic

---
 .../service/multimedia/vdr-addon/config/settings.xml  |  2 +-
 .../service/multimedia/vdr-addon/source/bin/vdr.start | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 561b2f90f6..7cd93246a1 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -6,5 +6,5 @@
     <setting id="enable_streamdev_client" value="false" />
     <setting id="enable_streamdev_server" value="false" />
     <setting id="enable_wirbelscan" value="true" />
-    <setting id="softcam_plugin" value="0" />
+    <setting id="softcam_plugin" value="sc" />
 </settings>
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index a79a497933..6bdc56876b 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -59,7 +59,7 @@ ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_SETTINGS | awk '{print $3}' | sed -
   ENABLE_STREAMDEV_SERVER=`grep enable_streamdev_server $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
 [ -z "$ENABLE_WIRBELSCAN" ] && \
   ENABLE_WIRBELSCAN=`grep enable_wirbelscan $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
-[ -z "$ENABLE_WIRBELSCAN" ] && \
+[ -z "SOFTCAM_PLUGIN" ] && \
   SOFTCAM_PLUGIN=`grep softcam_plugin $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
 [ -z "$ENABLE_DYNAMITE" ] && \
   ENABLE_DYNAMITE=`grep enable_dynamite $ADDON_DIR/settings-default.xml | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
@@ -71,14 +71,7 @@ VDR_ARG="$VDR_ARG --video=$ADDON_VIDEO_DIR"
 VDR_ARG="$VDR_ARG -P xvdr"
 
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then
-  case "$SOFTCAM_PLUGIN" in
-    0)
-      VDR_ARG="$VDR_ARG -P sc"
-      ;;
-    1)
-      VDR_ARG="$VDR_ARG -P dvbapi"
-      ;;
-  esac
+  VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"
 fi
 if [ "$ENABLE_IPTV" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P iptv"