summaryrefslogtreecommitdiff
path: root/receiver.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2005-01-23 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2005-01-23 18:00:00 +0100
commite36fe18c483b8e520752f61975e44ddd0317a332 (patch)
tree83cbf9e5ec53bcf099f702028f9d6720f5fe13ce /receiver.h
parentfb5cccb2df60361a18fe3fd572b0fe18f3a4331c (diff)
downloadvdr-patch-lnbsharing-e36fe18c483b8e520752f61975e44ddd0317a332.tar.gz
vdr-patch-lnbsharing-e36fe18c483b8e520752f61975e44ddd0317a332.tar.bz2
Version 1.3.19vdr-1.3.19
- Making sure at least the default skin is available at program start in case a plugin needs to issue an error message (thanks to Achim Tuffentshammer for reporting a crash in such a case). Also checking if there is a current skin in cSkins::Message(). - Completed the Finnish OSD texts and fixed internationalization of the text for "Setup/DVB/Audio language(s)" (thanks to Rolf Ahrenberg). - Completed the Estonian OSD texts and switched to iso8859-13 character set (thanks to Arthur Konovalov). - Made cCondWait::SleepMs() sleep at least 3ms to avoid a possible busy wait. - Fixed canceling the LIRC thread (thanks to Marco Schlüßler for pointing out this one). - The "Green" button in the "Main" menu is now always "Audio", since the audio channel might be changed even if there is only one actual audio PID. - Fixed handling the '-E' option which was broken in version 1.3.18 (thanks to Christian Jacobsen for reporting this one). - Added 'channels.conf.terr' entries for Mainz (thanks to Michael Heyse). - Implemented cDolbyRepacker for better handling of Dolby Digital PES packets (thanks to Reinhard Nissl). - Fixed playing files with PES packets longer than 2048 byte through the full featured DVB card (thanks to Marco Kremer for reporting this one and providing a test sample). - Recording and Transfer Mode now handle more than 2 audio PIDs. For this the interfaces of the following functions have been changed: cTransferControl::cTransferControl() cTransfer::cTransfer() cRecorder::cRecorder() cReceiver::cReceiver() cRemux::cRemux() - Fixed a possible race condition in cDevice::Action() and cTSBuffer::Action() (thanks to Stefan Huelswitt). - Extended some buffer sizes to allow handling HDTV streams (thanks to Reinhard Nissl). - Added 'channels.conf.terr' entries for Düsseldorf and Köln (thanks to Walter Koch). - Falling back to 'stereo' when switching channels in case the user had switched to 'left' or 'right' (suggested by Rolf Groppe). - Completed the Danish OSD texts (thanks to Mogens Elneff). - Recording and Transfer Mode can now handle up to 8 Dolby Digital tracks (thanks to Marco Schlüßler for a patch that implements substream handling into cDevice::PlayPesPacket(), and Reinhard Nissl for adding substream handling to cDolbyRepacker). - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer to avoid overflows (thanks to Marco Schlüßler for pointing this out).
Diffstat (limited to 'receiver.h')
-rw-r--r--receiver.h42
1 files changed, 22 insertions, 20 deletions
diff --git a/receiver.h b/receiver.h
index 8ad8bc0..959f6d6 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.2 2002/07/28 11:22:01 kls Exp $
+ * $Id: receiver.h 1.3 2005/01/16 14:05:10 kls Exp $
*/
#ifndef __RECEIVER_H
@@ -12,7 +12,7 @@
#include "device.h"
-#define MAXRECEIVEPIDS 16 // the maximum number of PIDs per receiver
+#define MAXRECEIVEPIDS 64 // the maximum number of PIDs per receiver
class cReceiver {
friend class cDevice;
@@ -21,30 +21,32 @@ private:
int ca;
int priority;
int pids[MAXRECEIVEPIDS];
+ int numPids;
bool WantsPid(int Pid);
protected:
void Detach(void);
virtual void Activate(bool On) {}
- // This function is called just before the cReceiver gets attached to
- // (On == true) or detached from (On == false) a cDevice. It can be used
- // to do things like starting/stopping a thread.
- // It is guaranteed that Receive() will not be called before Activate(true).
+ ///< This function is called just before the cReceiver gets attached to
+ ///< (On == true) or detached from (On == false) a cDevice. It can be used
+ ///< to do things like starting/stopping a thread.
+ ///< It is guaranteed that Receive() will not be called before Activate(true).
virtual void Receive(uchar *Data, int Length) = 0;
- // This function is called from the cDevice we are attached to, and
- // delivers one TS packet from the set of PIDs the cReceiver has requested.
- // The data packet must be accepted immediately, and the call must return
- // as soon as possible, without any unnecessary delay. Each TS packet
- // will be delivered only ONCE, so the cReceiver must make sure that
- // it will be able to buffer the data if necessary.
+ ///< This function is called from the cDevice we are attached to, and
+ ///< delivers one TS packet from the set of PIDs the cReceiver has requested.
+ ///< The data packet must be accepted immediately, and the call must return
+ ///< as soon as possible, without any unnecessary delay. Each TS packet
+ ///< will be delivered only ONCE, so the cReceiver must make sure that
+ ///< it will be able to buffer the data if necessary.
public:
- cReceiver(int Ca, int Priority, int NumPids, ...);
- // Creates a new receiver that requires conditional access Ca and has
- // 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).
+ cReceiver(int Ca, int Priority, int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
+ ///< Creates a new receiver that requires conditional access Ca and has
+ ///< the given Priority. Pid is a single PID (typically the video PID), while
+ ///< Pids1...Pids3 are pointers to zero terminated lists of PIDs.
+ ///< 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();
};