frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Dropped compatibility with VDR < 1.5.16

Browse Source
This commit is contained in:
Frank Schmirler 2011-03-07 21:50:05 +01:00 committed by root
parent ee7929bd39
commit 2cb0ba6cf1
6 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History VDR Plugin 'streamdev' Revision History
--------------------------------------- ---------------------------------------
- dropped compatibility with VDR < 1.5.16
- return value of streamdev-clients cDevice::NumProvidedSystems() now - return value of streamdev-clients cDevice::NumProvidedSystems() now
configurable in plugin setup configurable in plugin setup

2
client/device.c
View File

@ -49,9 +49,7 @@ cStreamdevDevice::~cStreamdevDevice() {
Cancel(3); Cancel(3);
#if APIVERSNUM >= 10515
StopSectionHandler(); StopSectionHandler();
#endif
DELETENULL(m_Filters); DELETENULL(m_Filters);
DELETENULL(m_TSBuffer); DELETENULL(m_TSBuffer);
} }

4
client/streamdev-client.c
View File

@ -10,8 +10,8 @@
#include "client/device.h" #include "client/device.h"
#include "client/setup.h" #include "client/setup.h"
#if !defined(APIVERSNUM) || APIVERSNUM < 10509 #if !defined(APIVERSNUM) || APIVERSNUM < 10516
#error "VDR-1.5.9 API version or greater is required!" #error "VDR-1.5.16 API version or greater is required!"
#endif #endif
const char *cPluginStreamdevClient::DESCRIPTION = trNOOP("VTP Streaming Client"); const char *cPluginStreamdevClient::DESCRIPTION = trNOOP("VTP Streaming Client");

17
server/connection.c
View File

@ -302,7 +302,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
&& UsedByLiveTV(device)) { && UsedByLiveTV(device)) {
// now we would have to switch away live tv...let's see if live tv // now we would have to switch away live tv...let's see if live tv
// can be handled by another device // can be handled by another device
#if VDRVERSNUM >= 10516
cDevice::SetAvoidDevice(device); cDevice::SetAvoidDevice(device);
if (!Channels.SwitchTo(cDevice::CurrentChannel())) { if (!Channels.SwitchTo(cDevice::CurrentChannel())) {
if (StreamdevServerSetup.SuspendMode == smAlways) { if (StreamdevServerSetup.SuspendMode == smAlways) {
@ -314,22 +313,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
device = NULL; 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) { if (!device) {

7
server/connectionVTP.c
View File

@ -1783,14 +1783,7 @@ bool cConnectionVTP::Respond(int Code, const char *Message, ...)
{ {
va_list ap; va_list ap;
va_start(ap, Message); 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); cString str = cString::sprintf(Message, ap);
#endif
va_end(ap); va_end(ap);
if (Code >= 0 && m_LastCommand != NULL) { if (Code >= 0 && m_LastCommand != NULL) {

4
server/streamdev-server.c
View File

@ -13,8 +13,8 @@
#include "server/server.h" #include "server/server.h"
#include "server/suspend.h" #include "server/suspend.h"
#if !defined(APIVERSNUM) || APIVERSNUM < 10509 #if !defined(APIVERSNUM) || APIVERSNUM < 10516
#error "VDR-1.5.9 API version or greater is required!" #error "VDR-1.5.16 API version or greater is required!"
#endif #endif
const char *cPluginStreamdevServer::DESCRIPTION = trNOOP("VDR Streaming Server"); const char *cPluginStreamdevServer::DESCRIPTION = trNOOP("VDR Streaming Server");