Streamdev 0.3.4

This commit is contained in:
Frank Schmirler
2010-12-02 09:02:31 +01:00
parent 7576173547
commit 31df0eaf8e
21 changed files with 1064 additions and 194 deletions

View File

@@ -1,5 +1,5 @@
/*
* $Id: device.c,v 1.14 2007/07/20 06:46:47 schmirl Exp $
* $Id: device.c,v 1.15 2007/12/12 12:22:45 schmirl Exp $
*/
#include "client/device.h"
@@ -212,8 +212,16 @@ void cStreamdevDevice::CloseDvrInt(void) {
}
Dprintf("cStreamdevDevice::CloseDvrInt(): Closing DVR connection\n");
#if VDRVERSNUM < 10500
DELETENULL(m_TSBuffer);
ClientSocket.CloseDvr();
#else
// Hack for VDR 1.5.x clients (sometimes sending ABRT after TUNE)
// TODO: Find a clean solution to fix this
ClientSocket.SetChannelDevice(m_Channel);
ClientSocket.CloseDvr();
DELETENULL(m_TSBuffer);
#endif
}
void cStreamdevDevice::CloseDvr(void) {

View File

@@ -1,5 +1,5 @@
/*
* $Id: socket.c,v 1.8 2007/04/24 10:57:34 schmirl Exp $
* $Id: socket.c,v 1.9 2008/03/13 16:01:17 schmirl Exp $
*/
#include <tools/select.h>
@@ -140,8 +140,14 @@ bool cClientSocket::CheckConnection(void) {
return false;
}
isyslog("Streamdev: Connected to server %s:%d using capabilities TSPIDS",
RemoteIp().c_str(), RemotePort());
const char *Filters = "";
#if VDRVERSNUM >= 10300
if(Command("CAPS FILTERS", 220))
Filters = ",FILTERS";
#endif
isyslog("Streamdev: Connected to server %s:%d using capabilities TSPIDS%s",
RemoteIp().c_str(), RemotePort(), Filters);
return true;
}