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

- protected cStreamer::Stop() from being called concurrently

This commit is contained in:
lordjaxom 2005-04-27 17:55:43 +00:00
parent c18ebf9158
commit 11dd989dfb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/streamer.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: streamer.c,v 1.9 2005/03/24 21:31:38 lordjaxom Exp $ * $Id: streamer.c,v 1.10 2005/04/27 17:55:43 lordjaxom Exp $
*/ */
#include <vdr/ringbuffer.h> #include <vdr/ringbuffer.h>
@ -73,8 +73,8 @@ cStreamdevStreamer::cStreamdevStreamer(const char *Name):
m_Active(false), m_Active(false),
m_Running(false), m_Running(false),
m_Writer(NULL), m_Writer(NULL),
m_RingBuffer(new cRingBufferLinear(STREAMERBUFSIZE, TS_SIZE * 2, true, m_RingBuffer(new cRingBufferLinear(STREAMERBUFSIZE, TS_SIZE * 2,
"streamdev-streamer")), true, "streamdev-streamer")),
m_SendBuffer(new cRingBufferLinear(WRITERBUFSIZE, TS_SIZE * 2)) m_SendBuffer(new cRingBufferLinear(WRITERBUFSIZE, TS_SIZE * 2))
{ {
m_RingBuffer->SetTimeouts(0, 100); m_RingBuffer->SetTimeouts(0, 100);
@ -107,6 +107,7 @@ void cStreamdevStreamer::Activate(bool On)
void cStreamdevStreamer::Stop(void) void cStreamdevStreamer::Stop(void)
{ {
Lock();
if (m_Active) { if (m_Active) {
Dprintf("stopping streamer\n"); Dprintf("stopping streamer\n");
m_Active = false; m_Active = false;
@ -117,6 +118,7 @@ void cStreamdevStreamer::Stop(void)
m_Running = false; m_Running = false;
DELETENULL(m_Writer); DELETENULL(m_Writer);
} }
Unlock();
} }
void cStreamdevStreamer::Action(void) void cStreamdevStreamer::Action(void)