From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 4 Jun 2014 06:15:36 +0000 (+0200)
Subject: capmt: webui - we know the oscam revision for mode 4
X-Git-Tag: v4.1~1971
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2f07a5baadfb322ec9de3216135d0b4a73b95b;p=thirdparty%2Ftvheadend.git

capmt: webui - we know the oscam revision for mode 4
---

diff --git a/docs/docresources/configcapmt.png b/docs/docresources/configcapmt.png
index 758940925..68d8ff3b6 100644
Binary files a/docs/docresources/configcapmt.png and b/docs/docresources/configcapmt.png differ
diff --git a/docs/html/config_capmt.html b/docs/html/config_capmt.html
index 56fd42dd8..69337a509 100644
--- a/docs/html/config_capmt.html
+++ b/docs/html/config_capmt.html
@@ -1,6 +1,7 @@
 <div class="hts-doc-text">
 
-  Tvheadend support connecting to card clients via the capmt protocol for so called softcam descrambling. 
+  Tvheadend support connecting to card clients via the capmt protocol for so called softcam
+  descrambling.
 
  <p>
  <img src="docresources/configcapmt.png">
@@ -36,7 +37,7 @@
   <dt>Camd.socket Filename / IP Address
   <dd>Socket filename which is usually opened by cam client. Tvheadend
       tries to connect to this socket file.
-      <p>
+      <br><br>
       In mode 3 (TCP), enter the IP address of the oscam server. Tvheadend
       tries to create a TCP connecting to this IP adress and <i>Connect port</i>.
 
@@ -51,7 +52,7 @@
       </dl>
       This module will communicate the received control-words back to
       Tvheadend via Port 9000
-      <p>
+      <br><br>
       In mode 3 (TCP), this port is used for the oscam connection. It must
       be equal to the listen port in the oscam/dvbapi settings.
 
@@ -64,7 +65,7 @@
       <dt>mode 1 (old OSCam)
       <dd>If selected, connection will be made directly to oscam without
           using LD_PRELOAD hack.<br>
-          Port 9000 will be used automatically.<br>
+          Port 9000 will be used automatically.<br><br>
           The following lines are required in <b>[dvbapi]</b> section of oscam.conf file:
           <dl>
             <dt>boxtype = pc<br>
@@ -73,17 +74,29 @@
           
       <dt>mode 2 (new OSCam since revision 9095)
       <dd>In this mode, no UDP connections are required. All communication
-          is processed though the Camd.socket
+          is processed though the Camd.socket. The configuration for OSCam
+          should be same as for mode 1.
           
       <dt>mode 3 (new OSCam since revision 9574)
       <dd>A TCP connection to server is created. All emm/ecm data are send
           to oscam using this connection without a requirement for the real
           linuxdvb devices in the system with OSCam. This mode is suitable
-          for all DVB devices including SAT>IP and IPTV.
+          for all DVB devices including SAT>IP and IPTV.<br><br>
+          The following lines are required in <b>[dvbapi]</b> section of oscam.conf file:
+          <dl>
+            <dt>boxtype = pc<br>
+                pmt_mode = 4<br>
+                listen_port = 9000 # or your preferred port<br>
+          </dl>
 
-      <dt>mode 4 (new OSCam since revision <i>patched</i>)
+      <dt>mode 4 (new OSCam since revision 9754)
       <dd>Similar to mode 3, but a Camd.socket connection is used instead
-         of the TCP connection.
+          of the TCP connection.<br><br>
+          The following lines are required in <b>[dvbapi]</b> section of oscam.conf file:
+          <dl>
+            <dt>boxtype = pc-nodmx<br>
+                pmt_mode = 4
+          </dl>
 
   <dt>Comment
   <dd>Allows the administrator to set a comment only visible in this editor.
diff --git a/src/webui/static/app/capmteditor.js b/src/webui/static/app/capmteditor.js
index a5e7cd183..90141b5ae 100644
--- a/src/webui/static/app/capmteditor.js
+++ b/src/webui/static/app/capmteditor.js
@@ -29,9 +29,9 @@ tvheadend.capmteditor = function() {
             fields: ['res', 'name'],
             id: 0,
             data: [
-                ['4', 'Patched OSCam (unix socket)'],
-                ['3', 'Recent OSCam (svn rev >= 9574 - TCP)'],
-                ['2', 'Recent OSCam (svn rev >= 9095)'],
+                ['4', 'OSCam pc-nodmx (rev >= 9756)'],
+                ['3', 'OSCam TCP (rev >= 9574)'],
+                ['2', 'OSCam (rev >= 9095)'],
                 ['1', 'Older OSCam'],
                 ['0', 'Wrapper (capmt_ca.so)']
             ]