frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Add support for new API of vdr 2.3.1.

Browse Source
This commit is contained in:
Johns 2015-09-24 14:31:51 +02:00
parent 8c347fdf1d
commit 509329c90a
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Add support for new API of vdr 2.3.1.
Fix bug: EnableDPMSatBlackScreen only available with USE_SCREENSAVER. Fix bug: EnableDPMSatBlackScreen only available with USE_SCREENSAVER.
- H264_EOS_TRICKSPEED and USE_MPEG_COMPLETE enabled as default. - H264_EOS_TRICKSPEED and USE_MPEG_COMPLETE enabled as default.

30
softhddevice.cpp
View File

@ -47,6 +47,13 @@ extern "C"
#include "codec.h" #include "codec.h"
} }
#if APIVERSNUM >= 20301
#define MURKS ->
#else
#define MURKS .
#define LOCK_CHANNELS_READ do { } while (0)
#endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
/// vdr-plugin version number. /// vdr-plugin version number.
@ -1500,7 +1507,11 @@ class cSoftReceiver:public cReceiver
{ {
protected: protected:
virtual void Activate(bool); virtual void Activate(bool);
#if APIVERSNUM >= 20301
virtual void Receive(const uchar *, int);
#else
virtual void Receive(uchar *, int); virtual void Receive(uchar *, int);
#endif
public: public:
cSoftReceiver(const cChannel *); ///< receiver constructor cSoftReceiver(const cChannel *); ///< receiver constructor
virtual ~ cSoftReceiver(); ///< receiver destructor virtual ~ cSoftReceiver(); ///< receiver destructor
@ -1634,7 +1645,11 @@ static void PipPesParse(const uint8_t * data, int size, int is_start)
** @param data ts packet ** @param data ts packet
** @param size size (#TS_PACKET_SIZE=188) of tes packet ** @param size size (#TS_PACKET_SIZE=188) of tes packet
*/ */
#if APIVERSNUM >= 20301
void cSoftReceiver::Receive(const uchar * data, int size)
#else
void cSoftReceiver::Receive(uchar * data, int size) void cSoftReceiver::Receive(uchar * data, int size)
#endif
{ {
const uint8_t *p; const uint8_t *p;
@ -1726,7 +1741,8 @@ static void NewPip(int channel_nr)
if (!channel_nr) { if (!channel_nr) {
channel_nr = cDevice::CurrentChannel(); channel_nr = cDevice::CurrentChannel();
} }
if (channel_nr && (channel = Channels.GetByNumber(channel_nr)) LOCK_CHANNELS_READ;
if (channel_nr && (channel = Channels MURKS GetByNumber(channel_nr))
&& (device = cDevice::GetDevice(channel, 0, false, false))) { && (device = cDevice::GetDevice(channel, 0, false, false))) {
DelPip(); DelPip();
@ -1772,14 +1788,16 @@ static void PipNextAvailableChannel(int direction)
DelPip(); // disable PIP to free the device DelPip(); // disable PIP to free the device
LOCK_CHANNELS_READ;
while (channel) { while (channel) {
bool ndr; bool ndr;
cDevice *device; cDevice *device;
channel = direction > 0 ? Channels.Next(channel) channel = direction > 0 ? Channels MURKS Next(channel)
: Channels.Prev(channel); : Channels MURKS Prev(channel);
if (!channel && Setup.ChannelsWrap) { if (!channel && Setup.ChannelsWrap) {
channel = direction > 0 ? Channels.First() : Channels.Last(); channel =
direction > 0 ? Channels MURKS First() : Channels MURKS Last();
} }
if (channel && !channel->GroupSep() if (channel && !channel->GroupSep()
&& (device = cDevice::GetDevice(channel, 0, false, true)) && (device = cDevice::GetDevice(channel, 0, false, true))
@ -1808,7 +1826,9 @@ static void SwapPipChannels(void)
NewPip(0); NewPip(0);
if (channel) { if (channel) {
Channels.SwitchTo(channel->Number()); LOCK_CHANNELS_READ;
Channels MURKS SwitchTo(channel->Number());
} }
} }