frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible change in DVB API 5.8

This commit is contained in:
Klaus Schmidinger 2012-10-04 12:44:13 +02:00
parent 1e9b16d20b
commit 612f696bb7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2695,6 +2695,7 @@ Derek Kelly (user.vdr@gmail.com)
several payloads
for reporting a problem with getting the maximum short channel name length in case there
are no short names at all
for reporting an incompatible change from DTV_DVBT2_PLP_ID to DTV_STREAM_ID in DVB API 5.8
Marcel Unbehaun <frostworks@gmx.de>
for adding cRecordingInfo::GetEvent()

3
HISTORY
View File

@ -7285,3 +7285,6 @@ Video Disk Recorder Revision History
priority threads may want to use this instead of the calls to SetPriority(19) and
SetIOPriority(7). The priority of a thread ("low" or "high") is now logged when the
thread starts.
- Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible
change in DVB API 5.8 (reported by Derek Kelly).
Removed the meanwhile obsolete definition of FE_CAN_TURBO_FEC.

8
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.c 2.72 2012/09/22 11:53:57 kls Exp $
* $Id: dvbdevice.c 2.73 2012/10/04 12:44:13 kls Exp $
*/
#include "dvbdevice.h"
@ -21,7 +21,9 @@
#include "menuitems.h"
#include "sourceparams.h"
#define FE_CAN_TURBO_FEC 0x8000000 // TODO: remove this once it is defined in the driver
#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
#define DTV_STREAM_ID DTV_DVBT2_PLP_ID
#endif
#define DVBS_TUNE_TIMEOUT 9000 //ms
#define DVBS_LOCK_TIMEOUT 2000 //ms
@ -810,7 +812,7 @@ bool cDvbTuner::SetFrontend(void)
SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
if (frontendType == SYS_DVBT2) {
// DVB-T2
SETCMD(DTV_DVBT2_PLP_ID, dtp.PlpId());
SETCMD(DTV_STREAM_ID, dtp.PlpId());
}
tuneTimeout = DVBT_TUNE_TIMEOUT;