diff options
Diffstat (limited to 'server/streamer.c')
| -rw-r--r-- | server/streamer.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/server/streamer.c b/server/streamer.c index eee3d63..2205f74 100644 --- a/server/streamer.c +++ b/server/streamer.c @@ -1,5 +1,5 @@ /* - * $Id: streamer.c,v 1.5 2005/02/09 19:47:09 lordjaxom Exp $ + * $Id: streamer.c,v 1.6 2005/02/10 22:24:26 lordjaxom Exp $ */ #include <vdr/ringbuffer.h> @@ -13,6 +13,8 @@ #include "tools/socket.h" #include "common.h" +// --- cStreamdevWriter ------------------------------------------------------- + cStreamdevWriter::cStreamdevWriter(cTBSocket *Socket, cStreamdevStreamer *Streamer): cThread("streamdev-writer"), m_Streamer(Streamer), @@ -29,6 +31,7 @@ cStreamdevWriter::~cStreamdevWriter() void cStreamdevWriter::Action(void) { + Dprintf("Writer start\n"); int max = 0; m_Active = true; while (m_Active) { @@ -49,13 +52,15 @@ void cStreamdevWriter::Action(void) Dprintf("Max. Transmit Blocksize was: %d\n", max); } +// --- cStreamdevStreamer ----------------------------------------------------- + cStreamdevStreamer::cStreamdevStreamer(const char *Name): cThread(Name), m_Active(false), m_Writer(NULL), m_RingBuffer(new cRingBufferLinear(STREAMERBUFSIZE, TS_SIZE * 2, true, "streamdev-streamer")), - m_SendBuffer(new cRingBufferLinear(WRITERBUFSIZE, MAXTRANSMITBLOCKSIZE)) + m_SendBuffer(new cRingBufferLinear(WRITERBUFSIZE, TS_SIZE * 2)) { m_RingBuffer->SetTimeouts(0, 100); m_SendBuffer->SetTimeouts(0, 100); @@ -71,12 +76,14 @@ cStreamdevStreamer::~cStreamdevStreamer() void cStreamdevStreamer::Start(cTBSocket *Socket) { + Dprintf("start streamer\n"); m_Writer = new cStreamdevWriter(Socket, this); Attach(); } void cStreamdevStreamer::Activate(bool On) { + Dprintf("activate streamer\n"); if (On && !m_Active) { m_Writer->Start(); cThread::Start(); @@ -92,21 +99,6 @@ void cStreamdevStreamer::Stop(void) } } -int cStreamdevStreamer::Put(const uchar *Data, int Count) -{ - return m_SendBuffer->Put(Data, Count); -} - -uchar *cStreamdevStreamer::Get(int &Count) -{ - return m_SendBuffer->Get(Count); -} - -void cStreamdevStreamer::Del(int Count) -{ - return m_SendBuffer->Del(Count); -} - void cStreamdevStreamer::Action(void) { int max = 0; |