summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/device.c9
-rw-r--r--client/device.h10
-rw-r--r--libdvbmpeg/Makefile2
3 files changed, 17 insertions, 4 deletions
diff --git a/client/device.c b/client/device.c
index 77c955a..ba4985d 100644
--- a/client/device.c
+++ b/client/device.c
@@ -1,5 +1,5 @@
/*
- * $Id: device.c,v 1.3 2005/02/08 14:19:29 lordjaxom Exp $
+ * $Id: device.c,v 1.4 2005/02/08 15:21:19 lordjaxom Exp $
*/
#include "client/device.h"
@@ -63,6 +63,12 @@ bool cStreamdevDevice::ProvidesSource(int Source) const {
return false;
}
+bool cStreamdevDevice::ProvidesTransponder(const cChannel *Channel) const
+{
+ Dprintf("ProvidesTransponder\n");
+ return false;
+}
+
bool cStreamdevDevice::ProvidesChannel(const cChannel *Channel, int Priority,
bool *NeedsDetachReceivers) const {
bool res = false;
@@ -99,6 +105,7 @@ bool cStreamdevDevice::SetChannelDevice(const cChannel *Channel,
m_Channel = Channel;
bool r = ClientSocket.SetChannelDevice(m_Channel);
Dprintf("setchanneldevice r=%d\n", r);
+ return r;
}
bool cStreamdevDevice::SetPid(cPidHandle *Handle, int Type, bool On) {
diff --git a/client/device.h b/client/device.h
index b7ab3da..bdfabb6 100644
--- a/client/device.h
+++ b/client/device.h
@@ -1,5 +1,5 @@
/*
- * $Id: device.h,v 1.2 2005/01/25 14:14:43 lordjaxom Exp $
+ * $Id: device.h,v 1.3 2005/02/08 15:21:19 lordjaxom Exp $
*/
#ifndef VDR_STREAMDEV_DEVICE_H
@@ -30,7 +30,12 @@ private:
protected:
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
- virtual bool HasLock(int TimeoutMs) { return m_TSBuffer != NULL; } // TODO
+ virtual bool HasLock(int TimeoutMs)
+ {
+ //printf("HasLock is %d\n", (ClientSocket.DataSocket(siLive) != NULL));
+ //return ClientSocket.DataSocket(siLive) != NULL;
+ return true;
+ }
virtual bool SetPid(cPidHandle *Handle, int Type, bool On);
virtual bool OpenDvr(void);
@@ -46,6 +51,7 @@ public:
virtual ~cStreamdevDevice();
virtual bool ProvidesSource(int Source) const;
+ virtual bool ProvidesTransponder(const cChannel *Channel) const;
virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1,
bool *NeedsDetachReceivers = NULL) const;
diff --git a/libdvbmpeg/Makefile b/libdvbmpeg/Makefile
index a56cb6b..60eba44 100644
--- a/libdvbmpeg/Makefile
+++ b/libdvbmpeg/Makefile
@@ -1,5 +1,5 @@
INCS = -I.
-CFLAGS = -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS = -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fPIC
MFLAG = -M
OBJS = ctools.o ringbuffy.o remux.o transform.o cpptools.o
SRC = $(wildcard *.c)