Fixed renamed constants

This commit is contained in:
Klaus Schmidinger 2008-09-07 11:55:36 +02:00
parent b203807818
commit 86b8a2ec24
2 changed files with 10 additions and 6 deletions

View File

@ -55,12 +55,16 @@ VDR Plugin 'sky' Revision History
as a query string.
- The getskyepg.pl script now replaces "&" with "&".
2007-08-15:Version 0.3.6
2007-08-15: Version 0.3.6
- Moved the "all" target in the Makefile before the "Implicit rules",
so that a plain "make" will compile everything.
2008-03-22:Version 0.3.7
2008-03-22: Version 0.3.7
- Removed the full path from the 'logger' call in the getskyepg.pl script (this
program is apparently "on the move" through the file system...).
2008-09-07: Version 0.3.8
- Fixed renamed constants (thanks to Udo Richter).

View File

@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
* $Id: sky.c 1.15 2008/03/22 10:19:32 kls Exp $
* $Id: sky.c 2.1 2008/09/07 11:54:07 kls Exp $
*/
#include <sys/socket.h>
@ -15,7 +15,7 @@
#include <vdr/plugin.h>
#include <vdr/sources.h>
static const char *VERSION = "0.3.7";
static const char *VERSION = "0.3.8";
static const char *DESCRIPTION = "Sky Digibox interface";
// --- cDigiboxDevice --------------------------------------------------------
@ -160,12 +160,12 @@ bool cDigiboxDevice::GetTSPacket(uchar *&Data)
Data = tsBuffer->Get();
if (Data) {
// insert the actual PIDs:
int Pid = (((uint16_t)Data[1] & PID_MASK_HI) << 8) | Data[2];
int Pid = (((uint16_t)Data[1] & TS_PID_MASK_HI) << 8) | Data[2];
if (Pid == DUMMYAPID)
Pid = apid;
else if (Pid == DUMMYVPID)
Pid = vpid;
Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~PID_MASK_HI);
Data[1] = ((Pid >> 8) & 0xFF) | (Data[1] & ~TS_PID_MASK_HI);
Data[2] = Pid & 0xFF;
}
return true;