From 2cb0ba6cf128f9263ff5d1d4695546dab84da768 Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Mon, 7 Mar 2011 21:50:05 +0100
Subject: Dropped compatibility with VDR < 1.5.16
---
server/connection.c | 17 -----------------
server/connectionVTP.c | 7 -------
server/streamdev-server.c | 4 ++--
3 files changed, 2 insertions(+), 26 deletions(-)
(limited to 'server')
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");
--
cgit v1.2.3