Dropped compatibility with VDR < 1.5.16

6 files changed, 5 insertions, 30 deletions

diff --git a/HISTORY b/HISTORY
index bdcad70..426650f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
  
+- dropped compatibility with VDR < 1.5.16
 - return value of streamdev-clients cDevice::NumProvidedSystems() now
   configurable in plugin setup
 
diff --git a/client/device.c b/client/device.c
index 9e78f80..7f39bbe 100644
--- a/client/device.c
+++ b/client/device.c
@@ -49,9 +49,7 @@ cStreamdevDevice::~cStreamdevDevice() {
 
 	Cancel(3);
 
-#if APIVERSNUM >= 10515
 	StopSectionHandler();
-#endif
 	DELETENULL(m_Filters);
 	DELETENULL(m_TSBuffer);
 }
diff --git a/client/streamdev-client.c b/client/streamdev-client.c
index 00fa90c..62c57bd 100644
--- a/client/streamdev-client.c
+++ b/client/streamdev-client.c
@@ -10,8 +10,8 @@
 #include "client/device.h"
 #include "client/setup.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 *cPluginStreamdevClient::DESCRIPTION = trNOOP("VTP Streaming Client");
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");