add example of channels.conf for vdr >= 1.7.13

And correct some errors on radio channels and channels without PCR-PID

2 files changed, 97 insertions, 11 deletions

diff --git a/example/channel-conv2.sh b/example/channel-conv2.sh
index a0225bf..1c39a54 100755
--- a/example/channel-conv2.sh
+++ b/example/channel-conv2.sh
@@ -31,16 +31,25 @@ do
   newparam=${param#*|}
 
   if [[ "$source" == "P" ]] && [[ "$pluginname" == "PVRINPUT" ]]; then
-    # split vpid in vpid, pcrpid and streamtype
-    vpcrpid=${vpid%%=*}
-    vtype=${vpid#*=}
-    realvpid=${vpcrpid%%+*}
-    pcrpid=${vpcrpid#*+}
-    if [[ -z "$vtype" ]]; then
-      vtype=2
-    fi
-    if [[ -z "$pcrpid" ]]; then
-      pcrpid=101
+    if [[ `expr index "$newparam" "RADIO"` -eq 1 ]]; then
+      newvpid=$vpid
+    else
+      # split vpid in vpid, pcrpid and streamtype
+      if [[ `expr index "$vpid" "="` -gt 0 ]]; then
+        vpcrpid=${vpid%%=*}
+        vtype=${vpid#*=}
+      else
+        vpcrpid=$vpid
+        vtype=2
+      fi
+      if [[ `expr index "$vpcrpid" "\+"` -gt 0 ]]; then
+        realvpid=${vpcrpid%%+*}
+        pcrpid=${vpcrpid#*+}
+      else
+        realvpid=$vpcrpid
+        pcrpid=101
+      fi
+      newvpid=$realvpid+$pcrpid=$vtype
     fi
 
     # if current sid is already 1 keep old tid
@@ -49,7 +58,7 @@ do
     fi
 
     # omit PVRINPUT from parameter, set source to V, set SID to 1 and old SID to TID
-    echo "$name:$freq:$newparam:V:$srate:$realvpid+$pcrpid=$vtype:$apid:$tpid:$caid:1:$nid:$sid:$rid" >> $NEWFILE
+    echo "$name:$freq:$newparam:V:$srate:$newvpid:$apid:$tpid:$caid:1:$nid:$sid:$rid" >> $NEWFILE
   else
     # non-pvrinput channel; copy n paste it
     echo "$name:$freq:$param:$source:$srate:$vpid:$apid:$tpid:$caid:$sid:$nid:$tid:$rid" >> $NEWFILE
diff --git a/example/channels.conf_vdr-1.7.13-syntax.example b/example/channels.conf_vdr-1.7.13-syntax.example
new file mode 100644
index 0000000..62e3715
--- /dev/null
+++ b/example/channels.conf_vdr-1.7.13-syntax.example
@@ -0,0 +1,77 @@
+SE2:112250:TV:V:0:301+101=2:300:305:0:1:0:1796:0
+SE3:119250:TV:V:0:301+101=2:300:305:0:1:0:1908:0
+SE4:126250:TV:V:0:301+101=2:300:305:0:1:0:2020:0
+SE5:133250:TV:V:0:301+101=2:300:305:0:1:0:2132:0
+SE6:140250:TV:V:0:301+101=2:300:305:0:1:0:2244:0
+SE7:147250:TV:V:0:301+101=2:300:305:0:1:0:2356:0
+SE8:154250:TV:V:0:301+101=2:300:305:0:1:0:2468:0
+SE9:161250:TV:V:0:301+101=2:300:305:0:1:0:2580:0
+SE10:168250:TV:V:0:301+101=2:300:305:0:1:0:2692:0
+k05:175250:TV:V:0:301+101=2:300:305:0:1:0:2804:0
+k06:182250:TV:V:0:301+101=2:300:305:0:1:0:2916:0
+k07:189250:TV:V:0:301+101=2:300:305:0:1:0:3028:0
+k08:196250:TV:V:0:301+101=2:300:305:0:1:0:3140:0
+k09:203250:TV:V:0:301+101=2:300:305:0:1:0:3252:0
+k10:210250:TV:V:0:301+101=2:300:305:0:1:0:3364:0
+k11:217250:TV:V:0:301+101=2:300:305:0:1:0:3476:0
+k12:224250:TV:V:0:301+101=2:300:305:0:1:0:3588:0
+SE11:231250:TV:V:0:301+101=2:300:305:0:1:0:3700:0
+SE12:238250:TV:V:0:301+101=2:300:305:0:1:0:3812:0
+SE13:245250:TV:V:0:301+101=2:300:305:0:1:0:3924:0
+SE14:252250:TV:V:0:301+101=2:300:305:0:1:0:4036:0
+SE15:259250:TV:V:0:301+101=2:300:305:0:1:0:4148:0
+SE16:266250:TV:V:0:301+101=2:300:305:0:1:0:4260:0
+SE17:273250:TV:V:0:301+101=2:300:305:0:1:0:4372:0
+SE18:280250:TV:V:0:301+101=2:300:305:0:1:0:4484:0
+SE19:287250:TV:V:0:301+101=2:300:305:0:1:0:4596:0
+SE20:294250:TV:V:0:301+101=2:300:305:0:1:0:4708:0
+S21:303250:TV:V:0:301+101=2:300:305:0:1:0:4852:0
+S22:311250:TV:V:0:301+101=2:300:305:0:1:0:4980:0
+S23:319250:TV:V:0:301+101=2:300:305:0:1:0:5108:0
+S24:327250:TV:V:0:301+101=2:300:305:0:1:0:5236:0
+S25:335250:TV:V:0:301+101=2:300:305:0:1:0:5364:0
+S26:343250:TV:V:0:301+101=2:300:305:0:1:0:5492:0
+S27:351250:TV:V:0:301+101=2:300:305:0:1:0:5620:0
+S28:359250:TV:V:0:301+101=2:300:305:0:1:0:5748:0
+S29:367250:TV:V:0:301+101=2:300:305:0:1:0:5876:0
+S30:375250:TV:V:0:301+101=2:300:305:0:1:0:6004:0
+S35:415250:TV:V:0:301+101=2:300:305:0:1:0:6644:0
+k21:471250:TV:V:0:301+101=2:300:305:0:1:0:7540:0
+k22:479250:TV:V:0:301+101=2:300:305:0:1:0:7668:0
+k23:487250:TV:V:0:301+101=2:300:305:0:1:0:7796:0
+k24:495250:TV:V:0:301+101=2:300:305:0:1:0:7924:0
+k25:503250:TV:V:0:301+101=2:300:305:0:1:0:8052:0
+k26:511250:TV:V:0:301+101=2:300:305:0:1:0:8180:0
+k27:519250:TV:V:0:301+101=2:300:305:0:1:0:8308:0
+k28:527250:TV:V:0:301+101=2:300:305:0:1:0:8436:0
+k29:535250:TV:V:0:301+101=2:300:305:0:1:0:8564:0
+k30:543250:TV:V:0:301+101=2:300:305:0:1:0:8692:0
+k31:551250:TV:V:0:301+101=2:300:305:0:1:0:8820:0
+k32:559250:TV:V:0:301+101=2:300:305:0:1:0:8948:0
+k33:567250:TV:V:0:301+101=2:300:305:0:1:0:9076:0
+k34:575250:TV:V:0:301+101=2:300:305:0:1:0:9204:0
+k35:583250:TV:V:0:301+101=2:300:305:0:1:0:9332:0
+k36:591250:TV:V:0:301+101=2:300:305:0:1:0:9460:0
+k37:599250:TV:V:0:301+101=2:300:305:0:1:0:9588:0
+k38:607250:TV:V:0:301+101=2:300:305:0:1:0:9716:0
+k39:615250:TV:V:0:301+101=2:300:305:0:1:0:9844:0
+k40:623250:TV:V:0:301+101=2:300:305:0:1:0:9972:0
+k41:631250:TV:V:0:301+101=2:300:305:0:1:0:10100:0
+k42:639250:TV:V:0:301+101=2:300:305:0:1:0:10228:0
+k43:647250:TV:V:0:301+101=2:300:305:0:1:0:10356:0
+k44:655250:TV:V:0:301+101=2:300:305:0:1:0:10484:0
+k45:663250:TV:V:0:301+101=2:300:305:0:1:0:10612:0
+:external inputs
+S-Video0 Card0:1:SVIDEO0|CARD0:V:0:301+101=2:300:305:0:1:0:9001:0
+S-Video0 Card1:1:SVIDEO0|CARD1:V:0:301+101=2:300:305:0:1:0:9002:0
+S-Video1 Card0:1:SVIDEO1|CARD0:V:0:301+101=2:300:305:0:1:0:9004:0
+S-Video1 Card1:1:SVIDEO1|CARD1:V:0:301+101=2:300:305:0:1:0:9005:0
+S-Video1 Card2:1:SVIDEO1|CARD2:V:0:301+101=2:300:305:0:1:0:9006:0
+Composite0 Card0:1:COMPOSITE0|CARD0:V:0:301+101=2:300:305:0:1:0:9007:0
+Composite0 Card1:1:COMPOSITE0|CARD1:V:0:301+101=2:300:305:0:1:0:9008:0
+Composite1 Card0:1:COMPOSITE1|CARD0:V:0:301+101=2:300:305:0:1:0:9009:0
+Composite1 Card1:1:COMPOSITE1|CARD1:V:0:301+101=2:300:305:0:1:0:9010:0
+:HD PVR
+HD PVR:1:COMPONENT:V:0:4113+4097=27:0;4352:0:0:1:1:9011:0
+:radio
+FM 107.6 MHz:107600:RADIO:V:0:0:300:305:0:1:0:1721:0