Fixed PID handling for cReceiver

6 files changed, 84 insertions, 42 deletions

diff --git a/HISTORY b/HISTORY
index d59d6ccd..420329f5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1379,7 +1379,7 @@ Video Disk Recorder Revision History
   for pointing out this one).
 - Disabled channels on Transponder 12070 in 'channels.conf', which apparently no longer transmits.
 
-2002-07-27: Version 1.1.6
+2002-07-28: Version 1.1.6
 
 - Re-visited the race condition fix in the cDvbPlayer (thanks again to Andreas
   Schultz).
@@ -1387,3 +1387,4 @@ Video Disk Recorder Revision History
   to set it when compiling a new version of VDR to at least see their recordings
   made with VFAT enabled (thanks to Christian Rienecker).
 - Added some missing teletext PIDs (thanks to Joerg Riechardt).
+- Fixed PID handling for cReceiver.
diff --git a/PLUGINS.html b/PLUGINS.html
index 3d450c25..2a66e88d 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -12,7 +12,7 @@ This interface allows programmers to develop additional functionality for VDR co
 separate from the core VDR source, without the need of patching the original
 VDR code (and all the problems of correlating various patches).
 <p>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 This document is divided into two parts, the first one describing the
 <a href="#Part I - The Outside Interface"><i>outside</i> interface</a>
 of the plugin system, and the second one describing the
@@ -23,18 +23,18 @@ The <i>inside</i> interface provides the plugin code access to VDR's internal da
 structures and allows it to hook itself into specific areas to perform special actions.
 <!--X1.1.3--></td></tr></table>
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
-Important modifications introduced in version 1.1.2 are marked like this.
-<!--X1.1.2--></td></tr></table>
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.3 are marked like this.
 <!--X1.1.3--></td></tr></table>
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.4 are marked like this.
 <!--X1.1.4--></td></tr></table>
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 Important modifications introduced in version 1.1.5 are marked like this.
 <!--X1.1.5--></td></tr></table>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+Important modifications introduced in version 1.1.6 are marked like this.
+<!--X1.1.6--></td></tr></table>
 
 <a name="Part I - The Outside Interface"><hr><center><h1>Part I - The Outside Interface</h1></center>
 
@@ -131,15 +131,12 @@ from the web, it will typically have a name like
 <p>
 and will unpack into a directory named
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <tt>hello-0.0.1</tt>
-<!--X1.1.2--></td></tr></table>
 <p>
 To use the <tt>plugins</tt> and <tt>plugins-clean</tt> targets from the VDR <tt>Makefile</tt>
 you need to unpack such an archive into the <tt>VDR/PLUGINS/src</tt> directory and
 create a symbolic link with the basic plugin name, as in
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 ln -s hello-0.0.1 hello
 </pre></td></tr></table><p>
@@ -149,7 +146,6 @@ of only lowercase characters and digits, it will only follow the symbolic links,
 should lead to the current version of the plugin you want to use. This way you can
 have several different versions of a plugin source (like <tt>hello-0.0.1</tt> and
 <tt>hello-0.0.2</tt>) and define which one to actually use through the symbolic link.
-<!--X1.1.2--></td></tr></table>
 
 <a name="Initializing a new plugin directory"><hr><h2>Initializing a new plugin directory</h2>
 
@@ -422,11 +418,9 @@ If a plugin implements a function that runs in the background (presumably in a
 thread of its own), or wants to make use of <a href="#Internationalization">internationalization</a>,
 it needs to implement the function
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 virtual bool Start(void);
 </pre></td></tr></table><p>
-<!--X1.1.2--></td></tr></table>
 
 which is called once for each plugin at program startup.
 Inside this function the plugin must set up everything necessary to perform
@@ -434,12 +428,10 @@ its task. This may, for instance, be a thread that collects data from the DVB
 stream, which is later presented to the user via a function that is available
 from the main menu.
 <p>
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 A return value of <i>false</i> indicates that something has gone wrong and the
 plugin will not be able to perform its task. In that case, the plugin should
 write a proper error message to the log file. The first plugin that returns
 <i>false</i> from its <tt>Start()</tt> function will cause VDR to exit.
-<!--X1.1.2--></td></tr></table>
 <p>
 If the plugin doesn't implement any background functionality or internationalized
 texts, it doesn't need to implement this function.
@@ -498,7 +490,6 @@ interaction is possible. If a specific action takes longer than a few seconds,
 the plugin should launch a separate thread to do this.
 </b>
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Housekeeping</h2>
 
 <center><i><b>Chores, chores...</b></i></center><p>
@@ -523,7 +514,6 @@ as possible! As long as the program stays inside this function, no other user
 interaction is possible. If a specific action takes longer than a few seconds,
 the plugin should launch a separate thread to do this.
 </b>
-<!--X1.1.2--></td></tr></table>
 
 <a name="Setup parameters"><hr><h2>Setup parameters</h2>
 
@@ -656,7 +646,6 @@ You can first assign the temporary values to the global variables and then do th
 your setup parameters and use that one to copy all parameters with one single statement
 (like VDR does with its cSetup class).
 
-<!--X1.1.2--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <hr><h2>Configuration files</h2>
 
 <center><i><b>I want my own stuff!</b></i></center><p>
@@ -711,7 +700,6 @@ plugin class, by writing
 <p><table><tr><td bgcolor=#F0F0F0><pre><br>
 const char *MyConfigDir = cPlugin::ConfigDirectory();
 </pre></td></tr></table><p>
-<!--X1.1.2--></td></tr></table>
 
 <a name="Internationalization"><hr><h2>Internationalization</h2>
 
@@ -826,7 +814,7 @@ and display their help and/or version information in addition to its own output.
 
 If you want to make your plugin available to other VDR users, you'll need to
 make a package that can be easily distributed.
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 The <tt>Makefile</tt> that has been created by the call to
 <a href="#Initializing a new plugin directory"><tt>newplugin</tt></a>
 provides the target <tt>dist</tt>, which does this for you.
@@ -848,7 +836,7 @@ vdr-hello-0.0.1.tgz
 in your source directory, where <tt>hello</tt> will be replaced with your actual
 plugin's name, and <tt>0.0.1</tt> will be your plugin's current version number.
 
-<!--X1.1.3--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
+<!--X1.1.3--><table width=100%><tr><td bgcolor=#0000AA>&nbsp;</td><td width=100%>
 <a name="Part II - The Inside Interface"><hr><center><h1>Part II - The Inside Interface</h1></center>
 
 <hr><h2>Status monitor</h2>
@@ -925,7 +913,7 @@ member functions are available in <tt>cStatus</tt>. You only need to implement
 the functions you actually want to use.
 <!--X1.1.3--></td></tr></table>
 
-<!--X1.1.4--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
+<!--X1.1.4--><table width=100%><tr><td bgcolor=#00AA00>&nbsp;</td><td width=100%>
 <hr><h2>Players</h2>
 
 <center><i><b>Play it again, Sam!</b></i></center><p>
@@ -1076,7 +1064,63 @@ that they already know. If you absolutely want to do things differently, just go
 ahead - it's your show...
 <!--X1.1.4--></td></tr></table>
 
-<!--X1.1.5--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<!--X1.1.6--><table width=100%><tr><td bgcolor=#FF0000>&nbsp;</td><td width=100%>
+<hr><h2>Receivers</h2>
+
+<center><i><b>Tapping into the stream...</b></i></center><p>
+
+In order to receive any kind of data from a <tt>cDevice</tt>, a plugin must set up an
+object derived from the <tt>cReceiver</tt> class:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+#include &lt;vdr/receiver.h&gt;
+
+class cMyReceiver : public cReceiver, cThread {
+protected:
+  virtual void Activate(bool On);
+  virtual void Receive(uchar *Data, int Length);
+public:
+  cMyReceiver(int Pid);
+  };
+
+cMyReceiver::cMyReceiver(int Pid)
+:cReceiver(0, -1, 1, Pid)
+{
+}
+
+void cMyReceiver::Activate(bool On)
+{
+  // start your own thread for processing the received data
+}
+
+void cMyReceiver::Receive(uchar *Data, int Length)
+{
+  // buffer the data for processing in a separate thread
+}
+</pre></td></tr></table><p>
+
+See the comments in <tt>VDR/receiver.h</tt> for details about the various
+member functions of <tt>cReceiver</tt>.
+<p>
+The above example sets up a receiver that wants to receive data from only one
+PID (for example the Teletext PID). In order to not interfere with other recording
+operations, it sets its priority to <tt>-1</tt> (any negative value will allow
+a <tt>cReceiver</tt> to be detached from its <tt>cDevice</tt> at any time.
+<p>
+Once a <tt>cReceiver</tt> has been created, it needs to be <i>attached</i> to
+a <tt>cDevice</tt>:
+
+<p><table><tr><td bgcolor=#F0F0F0><pre><br>
+cMyReceiver *Receiver = new cMyReceiver(123);
+
+cDevice::PrimaryDevice()-&gt;AttachReceiver(Receiver);
+</pre></td></tr></table><p>
+
+If the <tt>cReceiver</tt> isn't needed any more, it may simply be <i>deleted</i>
+and will automatically detach itself from the <tt>cDevice</tt>.
+<!--X1.1.6--></td></tr></table>
+
+<!--X1.1.5--><table width=100%><tr><td bgcolor=#AA0000>&nbsp;</td><td width=100%>
 <hr><h2>The On Screen Display</h2>
 
 <center><i><b>Express yourself</b></i></center><p>
diff --git a/device.c b/device.c
index c85cd450..9e707515 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.5 2002/06/23 12:51:24 kls Exp $
+ * $Id: device.c 1.6 2002/07/28 11:03:53 kls Exp $
  */
 
 #include "device.h"
@@ -882,7 +882,7 @@ int cDevice::ProvidesCa(int Ca)
 bool cDevice::Receiving(void)
 {
   for (int i = 0; i < MAXRECEIVERS; i++) {
-      if (receiver[i])
+      if (receiver[i] && receiver[i]->priority > 0) // cReceiver with priority < 0 doesn't count
          return true;
       }
   return false;
@@ -964,12 +964,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
   for (int i = 0; i < MAXRECEIVERS; i++) {
       if (!receiver[i]) {
          //siProcessor->SetStatus(false);//XXX+
-         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
-             if (Receiver->pids[n])
-                AddPid(Receiver->pids[n]);//XXX+ retval!
-             else
-                break;
-             }
+         for (int n = 0; n < MAXRECEIVEPIDS; n++)
+             AddPid(Receiver->pids[n]);//XXX+ retval!
          Receiver->Activate(true);
          Lock();
          Receiver->device = this;
@@ -995,12 +991,8 @@ void cDevice::Detach(cReceiver *Receiver)
          receiver[i] = NULL;
          Receiver->device = NULL;
          Unlock();
-         for (int n = 0; n < MAXRECEIVEPIDS; n++) {
-             if (Receiver->pids[n])
-                DelPid(Receiver->pids[n]);
-             else
-                break;
-             }
+         for (int n = 0; n < MAXRECEIVEPIDS; n++)
+             DelPid(Receiver->pids[n]);
          }
       else if (receiver[i])
          receiversLeft = true;
diff --git a/device.h b/device.h
index 6f2a34fd..124dcdc3 100644
--- a/device.h
+++ b/device.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.h 1.3 2002/06/23 11:50:24 kls Exp $
+ * $Id: device.h 1.4 2002/07/28 10:48:12 kls Exp $
  */
 
 #ifndef __DEVICE_H
@@ -89,7 +89,7 @@ private:
 public:
   cDevice(int n);
   virtual ~cDevice();
-  bool IsPrimaryDevice(void) { return this == primaryDevice; }
+  bool IsPrimaryDevice(void) const { return this == primaryDevice; }
   int CardIndex(void) const { return cardIndex; }
          // Returns the card index of this device (0 ... MAXDEVICES - 1).
   int ProvidesCa(int Ca);
diff --git a/receiver.c b/receiver.c
index 6ddbaa64..8f94c1a1 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 1.1 2002/06/10 16:30:00 kls Exp $
+ * $Id: receiver.c 1.2 2002/07/28 10:48:42 kls Exp $
  */
 
 #include <stdarg.h>
@@ -16,6 +16,8 @@ cReceiver::cReceiver(int Ca, int Priority, int NumPids, ...)
   device = NULL;
   ca = Ca;
   priority = Priority;
+  for (int i = 0; i < MAXRECEIVEPIDS; i++)
+      pids[i] = 0;
   if (NumPids) {
      va_list ap;
      va_start(ap, NumPids);
diff --git a/receiver.h b/receiver.h
index 87fe9b86..8ad8bc06 100644
--- a/receiver.h
+++ b/receiver.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.h 1.1 2002/06/10 16:30:00 kls Exp $
+ * $Id: receiver.h 1.2 2002/07/28 11:22:01 kls Exp $
  */
 
 #ifndef __RECEIVER_H
@@ -42,6 +42,9 @@ public:
                // the given Priority. NumPids defines the number of PIDs that follow
                // this parameter. If any of these PIDs are 0, they will be silently ignored.
                // The total number of non-zero PIDs must not exceed MAXRECEIVEPIDS.
+               // Priority may be any value in the range 0..99. Negative values indicate
+               // that this cReceiver may be detached at any time (without blocking the
+               // cDevice it is attached to).
   virtual ~cReceiver();
   };