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

Removed support for older version than vdr-2.3.1.

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-09-18 18:41:56 +03:00
parent 37a0572a64
commit 67b6c9f4f7
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HISTORY
View File

@ -144,3 +144,12 @@ VDR Plugin 'satip' Revision History
- Reset the RTSP connection after any failed connect. - Reset the RTSP connection after any failed connect.
- Added tweaks for minisatip and Schwaiger MS41IP. - Added tweaks for minisatip and Schwaiger MS41IP.
- Updated for vdr-2.3.1 (Thanks to Klaus Schmidinger). - Updated for vdr-2.3.1 (Thanks to Klaus Schmidinger).
===================================
VDR Plugin 'satip' Revision History
===================================
2015-XX-XX: Version 2.3.0
- ...

10
device.c
View File

@ -103,12 +103,8 @@ 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; LOCK_TIMERS_READ;
for (const cTimer *timer = Timers->First(); timer; timer = Timers->Next(timer)) { for (const cTimer *timer = Timers->First(); timer; timer = Timers->Next(timer)) {
#else
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)
@ -133,20 +129,14 @@ 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; 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()); *Channels->GetByNumber(cDevice::CurrentChannel())->ToText());
#else
*Channels.GetByNumber(cDevice::CurrentChannel())->ToText());
#endif
} }
cString cSatipDevice::GetPidsInformation(void) cString cSatipDevice::GetPidsInformation(void)

2
po/ca_ES.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.2.3\n" "Project-Id-Version: vdr-satip 2.3.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-04-26 04:26+0300\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n"
"PO-Revision-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n"

2
po/de_DE.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.2.3\n" "Project-Id-Version: vdr-satip 2.3.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-04-26 04:26+0300\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n"
"PO-Revision-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n"

2
po/es_ES.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.2.3\n" "Project-Id-Version: vdr-satip 2.3.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-04-26 04:26+0300\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n"
"PO-Revision-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n"

2
po/fi_FI.po
View File

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vdr-satip 2.2.3\n" "Project-Id-Version: vdr-satip 2.3.0\n"
"Report-Msgid-Bugs-To: <see README>\n" "Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2015-04-26 04:26+0300\n" "POT-Creation-Date: 2015-04-26 04:26+0300\n"
"PO-Revision-Date: 2015-04-26 04:26+0300\n" "PO-Revision-Date: 2015-04-26 04:26+0300\n"

6
satip.c
View File

@ -19,15 +19,15 @@
#warning "CURL version >= 7.36.0 is recommended" #warning "CURL version >= 7.36.0 is recommended"
#endif #endif
#if defined(APIVERSNUM) && APIVERSNUM < 20200 #if defined(APIVERSNUM) && APIVERSNUM < 20301
#error "VDR-2.2.0 API version or greater is required!" #error "VDR-2.3.1 API version or greater is required!"
#endif #endif
#ifndef GITVERSION #ifndef GITVERSION
#define GITVERSION "" #define GITVERSION ""
#endif #endif
const char VERSION[] = "2.2.3" GITVERSION; const char VERSION[] = "2.3.0" GITVERSION;
static const char DESCRIPTION[] = trNOOP("SAT>IP Devices"); static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
class cPluginSatip : public cPlugin { class cPluginSatip : public cPlugin {