diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2008-09-07 11:55:36 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2008-09-07 11:55:36 +0200 |
| commit | 86b8a2ec24ae86928f8b991f4a6a735e41a03f59 (patch) | |
| tree | 7f94a2ac3cbdc70cdc2882f74fcf5260d22876ee | |
| parent | b20380781875b603bf84efb161ecdbf8cbd3c950 (diff) | |
| download | vdr-86b8a2ec24ae86928f8b991f4a6a735e41a03f59.tar.gz vdr-86b8a2ec24ae86928f8b991f4a6a735e41a03f59.tar.bz2 | |
Fixed renamed constants
| -rw-r--r-- | PLUGINS/src/sky/HISTORY | 8 | ||||
| -rw-r--r-- | PLUGINS/src/sky/sky.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY index b39b65d9..25b8fc87 100644 --- a/PLUGINS/src/sky/HISTORY +++ b/PLUGINS/src/sky/HISTORY @@ -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). diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c index 0393dc2c..75bd9ec5 100644 --- a/PLUGINS/src/sky/sky.c +++ b/PLUGINS/src/sky/sky.c @@ -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; |