- updated to 1.3.19

This commit is contained in:
lordjaxom 2005-01-25 14:14:43 +00:00
parent 302fa2e672
commit 04a5985dcc
4 changed files with 15 additions and 11 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: assembler.c,v 1.1 2004/12/30 22:44:04 lordjaxom Exp $
* $Id: assembler.c,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
*/
#include "client/assembler.h"
@ -33,7 +33,7 @@ cStreamdevAssembler::cStreamdevAssembler(cTBSocket *Socket)
cStreamdevAssembler::~cStreamdevAssembler() {
if (m_Active) {
m_Active = false;
WakeUp();
/* WakeUp();*/
Cancel(3);
}
close(m_Pipe[0]);

View File

@ -1,5 +1,5 @@
/*
* $Id: device.c,v 1.1 2004/12/30 22:44:00 lordjaxom Exp $
* $Id: device.c,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
*/
#include "client/device.h"
@ -132,10 +132,14 @@ void cStreamdevDevice::CloseDvr(void) {
bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
if (m_TSBuffer) {
int r;
Data = m_TSBuffer->Get();
return true;
}
return false;
/*int r;
while ((r = m_TSBuffer->Read()) >= 0) {
Data = m_TSBuffer->Get();
#if VDRVERSNUM >= 10300
#if VDRVERSNUM >= 10300 // --> TODO: no filter streaming yet
if (Data != NULL) {
u_short pid = (((u_char)Data[1] & PID_MASK_HI) << 8) | Data[2];
u_char tid = Data[3];
@ -151,9 +155,7 @@ bool cStreamdevDevice::GetTSPacket(uchar *&Data) {
LOG_ERROR;
return false;
}
return true;
}
return false;
return true;*/
}
#if VDRVERSNUM >= 10300

View File

@ -1,5 +1,5 @@
/*
* $Id: device.h,v 1.1 2004/12/30 22:44:00 lordjaxom Exp $
* $Id: device.h,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
*/
#ifndef VDR_STREAMDEV_DEVICE_H
@ -30,7 +30,7 @@ private:
protected:
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
virtual bool HasLock(void) { return m_TSBuffer != NULL; }
virtual bool HasLock(int TimeoutMs) { return m_TSBuffer != NULL; } // TODO
virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
virtual bool OpenDvr(void);

View File

@ -4,6 +4,8 @@
#include "libdvbmpeg/transform.h"
#include <vdr/remux.h>
#define RESULTBUFFERSIZE KILOBYTE(256)
class cTSRemux {
protected:
uchar m_ResultBuffer[RESULTBUFFERSIZE];