frodovdr
/
vdr-plugin-streamdev
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Lock in ~cStreamdevDevice when shutting down (#355). 

Thanks to Petri Hintukainen.
This commit is contained in:
schmirl 2007-07-20 06:46:47 +00:00
parent 60b44caf3d
commit e9bd0c96f3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/device.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: device.c,v 1.13 2007/05/07 12:18:18 schmirl Exp $ * $Id: device.c,v 1.14 2007/07/20 06:46:47 schmirl Exp $
*/ */
#include "client/device.h" #include "client/device.h"
@ -51,12 +51,21 @@ cStreamdevDevice::cStreamdevDevice(void) {
cStreamdevDevice::~cStreamdevDevice() { cStreamdevDevice::~cStreamdevDevice() {
Dprintf("Device gets destructed\n"); Dprintf("Device gets destructed\n");
Lock();
m_Device = NULL; m_Device = NULL;
delete m_TSBuffer; m_Filters->SetConnection(-1);
delete m_Assembler; ClientSocket.Quit();
ClientSocket.Reset();
Unlock();
Cancel(3);
#if VDRVERSNUM >= 10300 #if VDRVERSNUM >= 10300
delete m_Filters; DELETENULL(m_Filters);
#endif #endif
DELETENULL(m_TSBuffer);
delete m_Assembler;
} }
bool cStreamdevDevice::ProvidesSource(int Source) const { bool cStreamdevDevice::ProvidesSource(int Source) const {
@ -216,7 +225,7 @@ void cStreamdevDevice::CloseDvr(void) {
} }
bool cStreamdevDevice::GetTSPacket(uchar *&Data) { bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
if (m_TSBuffer) { if (m_TSBuffer && m_Device) {
Data = m_TSBuffer->Get(); Data = m_TSBuffer->Get();
#if 1 // TODO: this should be fixed in vdr cTSBuffer #if 1 // TODO: this should be fixed in vdr cTSBuffer
// simple disconnect detection // simple disconnect detection