frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Updated for vdr-2.3.1 (Thanks to Klaus Schmidinger).

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-08-20 19:12:21 +03:00
parent e90b8651e6
commit c3ad29eb27
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -142,3 +142,4 @@ VDR Plugin 'satip' Revision History
- Added a timeout for releasing idling devices. - Added a timeout for releasing idling devices.
- Reset the RTSP connection after any failed connect. - Reset the RTSP connection after any failed connect.
- Updated for vdr-2.3.1 (Thanks to Klaus Schmidinger).

12
device.c
View File

@ -103,7 +103,12 @@ cString cSatipDevice::GetSatipStatus(void)
bool live = (device == cDevice::ActualDevice()); bool live = (device == cDevice::ActualDevice());
bool lock = device->HasLock(); bool lock = device->HasLock();
const cChannel *channel = device->GetCurrentlyTunedTransponder(); const cChannel *channel = device->GetCurrentlyTunedTransponder();
#if defined(APIVERSNUM) && APIVERSNUM >= 20301
LOCK_TIMERS_READ;
for (const cTimer *timer = Timers->First(); timer; timer = Timers->Next(timer)) {
#else
for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) { for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
#endif
if (timer->Recording()) { if (timer->Recording()) {
cRecordControl *control = cRecordControls::GetRecordControl(timer); cRecordControl *control = cRecordControls::GetRecordControl(timer);
if (control && control->Device() == device) if (control && control->Device() == device)
@ -128,13 +133,20 @@ cString cSatipDevice::GetSatipStatus(void)
cString cSatipDevice::GetGeneralInformation(void) cString cSatipDevice::GetGeneralInformation(void)
{ {
debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM); debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
#if defined(APIVERSNUM) && APIVERSNUM >= 20301
LOCK_CHANNELS_READ;
#endif
return cString::sprintf("SAT>IP device: %d\nCardIndex: %d\nStream: %s\nSignal: %s\nStream bitrate: %s\n%sChannel: %s", return cString::sprintf("SAT>IP device: %d\nCardIndex: %d\nStream: %s\nSignal: %s\nStream bitrate: %s\n%sChannel: %s",
deviceIndexM, CardIndex(), deviceIndexM, CardIndex(),
pTunerM ? *pTunerM->GetInformation() : "", pTunerM ? *pTunerM->GetInformation() : "",
pTunerM ? *pTunerM->GetSignalStatus() : "", pTunerM ? *pTunerM->GetSignalStatus() : "",
pTunerM ? *pTunerM->GetTunerStatistic() : "", pTunerM ? *pTunerM->GetTunerStatistic() : "",
*GetBufferStatistic(), *GetBufferStatistic(),
#if defined(APIVERSNUM) && APIVERSNUM >= 20301
*Channels->GetByNumber(cDevice::CurrentChannel())->ToText());
#else
*Channels.GetByNumber(cDevice::CurrentChannel())->ToText()); *Channels.GetByNumber(cDevice::CurrentChannel())->ToText());
#endif
} }
cString cSatipDevice::GetPidsInformation(void) cString cSatipDevice::GetPidsInformation(void)