diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2011-03-07 21:50:05 +0100 |
|---|---|---|
| committer | root <root@schleppi.(none)> | 2011-03-07 22:05:36 +0100 |
| commit | 2cb0ba6cf128f9263ff5d1d4695546dab84da768 (patch) | |
| tree | f966f67f3c14c78dd68a5ea10c0a1e98e4695840 /server | |
| parent | ee7929bd39101f877ee731c96c457b5e38565b37 (diff) | |
| download | vdr-plugin-streamdev-2cb0ba6cf128f9263ff5d1d4695546dab84da768.tar.gz vdr-plugin-streamdev-2cb0ba6cf128f9263ff5d1d4695546dab84da768.tar.bz2 | |
Dropped compatibility with VDR < 1.5.16
Diffstat (limited to 'server')
| -rw-r--r-- | server/connection.c | 17 | ||||
| -rw-r--r-- | server/connectionVTP.c | 7 | ||||
| -rw-r--r-- | server/streamdev-server.c | 4 |
3 files changed, 2 insertions, 26 deletions
diff --git a/server/connection.c b/server/connection.c index 78a023a..2eba103 100644 --- a/server/connection.c +++ b/server/connection.c @@ -302,7 +302,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) && UsedByLiveTV(device)) { // now we would have to switch away live tv...let's see if live tv // can be handled by another device -#if VDRVERSNUM >= 10516 cDevice::SetAvoidDevice(device); if (!Channels.SwitchTo(cDevice::CurrentChannel())) { if (StreamdevServerSetup.SuspendMode == smAlways) { @@ -314,22 +313,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) device = NULL; } } -#else - const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); - cDevice *newdev = current ? CheckDevice(current, 0, true, device) : NULL; - if (newdev) { - dsyslog("streamdev: GetDevice: Trying to move live TV to device %d", newdev->CardIndex()); - newdev->SwitchChannel(current, true); - } - else if (StreamdevServerSetup.SuspendMode == smAlways) { - Channels.SwitchTo(Channel->Number()); - Skins.QueueMessage(mtInfo, tr("Streaming active")); - } - else { - dsyslog("streamdev: GetDevice: Live TV not suspended"); - device = NULL; - } -#endif } if (!device) { diff --git a/server/connectionVTP.c b/server/connectionVTP.c index 0f92db0..411f3fd 100644 --- a/server/connectionVTP.c +++ b/server/connectionVTP.c @@ -1783,14 +1783,7 @@ bool cConnectionVTP::Respond(int Code, const char *Message, ...) { va_list ap; va_start(ap, Message); -#if APIVERSNUM < 10515 - char *buffer; - if (vasprintf(&buffer, Message, ap) < 0) - buffer = strdup("???"); - cString str(buffer, true); -#else cString str = cString::sprintf(Message, ap); -#endif va_end(ap); if (Code >= 0 && m_LastCommand != NULL) { diff --git a/server/streamdev-server.c b/server/streamdev-server.c index b444df7..5777655 100644 --- a/server/streamdev-server.c +++ b/server/streamdev-server.c @@ -13,8 +13,8 @@ #include "server/server.h" #include "server/suspend.h" -#if !defined(APIVERSNUM) || APIVERSNUM < 10509 -#error "VDR-1.5.9 API version or greater is required!" +#if !defined(APIVERSNUM) || APIVERSNUM < 10516 +#error "VDR-1.5.16 API version or greater is required!" #endif const char *cPluginStreamdevServer::DESCRIPTION = trNOOP("VDR Streaming Server"); |