mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
09a17d56e2
- Changed the EVCONTENTMASK_* macros to enums and changed "mask" to "group". - Updated the Estonian OSD texts (thanks to Arthur Konovalov). - The "Edit timer" menu can now set the folder for the recording from a list of folders stored in "folders.conf". - Updated the Italian OSD texts (thanks to Diego Pierotto). - If svdrphosts.conf contains only the address of the local host, the SVDRP port is opened only for the local host (thanks to Manuel Reimer). - Renamed 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR in 'make install' (thanks to Martin Dauskardt). - Added plain text error messages to log entries from cOsd::SetAreas() (suggested by Rolf Ahrenberg). - cPalette::ClosestColor() now treats fully transparent colors as "equal"; improved cDvbSpuBitmap::getMinBpp() (thanks to Matthieu Castet and Johann Friedrichs). - The new setup option "Miscellaneous/Channels wrap" controls whether the current channel wraps around the beginning or end of the channel list when zapping (thanks to Matti Lehtimäki). - Fixed determining the frame duration on channels where the PTS deltas jitter by +/-1 around 1800. - The PCR pid in generated PMTs is now set to the channel's PCR pid again. - Fixed determining the frame duration on channels where the PTS deltas jitter by +/-1 around 3600. - The PCR pid is now recorded for channels where this is different from the video PID. To facilitate this, the interfaces of cTransfer, cTransferControl, cRecorder and cReceiver have been modified, so that the PIDs are no longer given in separate parameters, but rather the whole channel is handed down for processing. The old constructor of cReceiver is still available, but it is recommended to plugin authors that they switch to the new interface as soon as possible. When replaying such a recording, the PCR packets are sent to PlayTsVideo() - The files "commands.conf" and "reccmd.conf" can now contain nested lists of commands. See vdr.5 for information about the new file format.
106 lines
2.3 KiB
C
106 lines
2.3 KiB
C
/*
|
|
* receiver.c: The basic receiver interface
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: receiver.c 2.2 2010/01/30 10:25:38 kls Exp $
|
|
*/
|
|
|
|
#include "receiver.h"
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include "tools.h"
|
|
|
|
#ifdef LEGACY_CRECEIVER
|
|
cReceiver::cReceiver(tChannelID ChannelID, int Priority, int Pid, const int *Pids1, const int *Pids2, const int *Pids3)
|
|
{
|
|
device = NULL;
|
|
channelID = ChannelID;
|
|
priority = Priority;
|
|
numPids = 0;
|
|
AddPid(Pid);
|
|
AddPids(Pids1);
|
|
AddPids(Pids2);
|
|
AddPids(Pids3);
|
|
}
|
|
#endif
|
|
|
|
cReceiver::cReceiver(const cChannel *Channel, int Priority)
|
|
{
|
|
device = NULL;
|
|
priority = Priority;
|
|
numPids = 0;
|
|
SetPids(Channel);
|
|
}
|
|
|
|
cReceiver::~cReceiver()
|
|
{
|
|
if (device) {
|
|
const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
|
|
esyslog("%s", msg);
|
|
fprintf(stderr, "%s\n", msg);
|
|
*(char *)0 = 0; // cause a segfault
|
|
}
|
|
}
|
|
|
|
bool cReceiver::AddPid(int Pid)
|
|
{
|
|
if (Pid) {
|
|
if (numPids < MAXRECEIVEPIDS)
|
|
pids[numPids++] = Pid;
|
|
else {
|
|
dsyslog("too many PIDs in cReceiver (Pid = %d)", Pid);
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool cReceiver::AddPids(const int *Pids)
|
|
{
|
|
if (Pids) {
|
|
while (*Pids) {
|
|
if (!AddPid(*Pids++))
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool cReceiver::AddPids(int Pid1, int Pid2, int Pid3, int Pid4, int Pid5, int Pid6, int Pid7, int Pid8, int Pid9)
|
|
{
|
|
return AddPid(Pid1) && AddPid(Pid2) && AddPid(Pid3) && AddPid(Pid4) && AddPid(Pid5) && AddPid(Pid6) && AddPid(Pid7) && AddPid(Pid8) && AddPid(Pid9);
|
|
}
|
|
|
|
bool cReceiver::SetPids(const cChannel *Channel)
|
|
{
|
|
numPids = 0;
|
|
if (Channel) {
|
|
channelID = Channel->GetChannelID();
|
|
return AddPid(Channel->Vpid()) &&
|
|
(Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
|
|
AddPids(Channel->Apids()) &&
|
|
(!Setup.UseDolbyDigital || AddPids(Channel->Dpids())) &&
|
|
AddPids(Channel->Spids());
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool cReceiver::WantsPid(int Pid)
|
|
{
|
|
if (Pid) {
|
|
for (int i = 0; i < numPids; i++) {
|
|
if (pids[i] == Pid)
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void cReceiver::Detach(void)
|
|
{
|
|
if (device)
|
|
device->Detach(this);
|
|
}
|