diff --git a/server/connection.c b/server/connection.c
index 20d1be1..dff1945 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: connection.c,v 1.7 2006/09/14 10:38:22 schmirl Exp $
+ *  $Id: connection.c,v 1.8 2007/01/15 12:00:19 schmirl Exp $
  */
  
 #include "server/connection.h"
@@ -132,7 +132,11 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
 	Dprintf(" * GetDevice(const cChannel*, int)\n");
 	Dprintf(" * -------------------------------\n");
 
+#if VDRVERSNUM < 10500
 	device = cDevice::GetDevice(Channel, Priority);
+#else
+	device = cDevice::GetDevice(Channel, Priority, false);
+#endif
 
 	Dprintf(" * Found following device: %p (%d)\n", device, 
 			device ? device->CardIndex() + 1 : 0);
@@ -150,7 +154,11 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
 		const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel());
 		isyslog("streamdev-server: Detaching current receiver");
 		Detach();
+#if VDRVERSNUM < 10500
 		device = cDevice::GetDevice(Channel, Priority);
+#else
+		device = cDevice::GetDevice(Channel, Priority, false);
+#endif
 		Attach();
 		Dprintf(" * Found following device: %p (%d)\n", device, 
 				device ? device->CardIndex() + 1 : 0);
diff --git a/server/livestreamer.c b/server/livestreamer.c
index e2b4b6c..6148720 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -8,9 +8,15 @@
 
 // --- cStreamdevLiveReceiver -------------------------------------------------
 
+#if VDRVERSNUM < 10500
 cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, int Ca, 
                                                int Priority, const int *Pids):
 		cReceiver(Ca, Priority, 0, Pids),
+#else
+cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, tChannelID ChannelID, 
+                                               int Priority, const int *Pids):
+		cReceiver(ChannelID, Priority, 0, Pids),
+#endif
 		m_Streamer(Streamer)
 {
 }
@@ -90,7 +96,11 @@ bool cStreamdevLiveStreamer::SetPid(int Pid, bool On)
 	DELETENULL(m_Receiver);
 	if (m_NumPids > 0) {
 		Dprintf("Creating Receiver to respect changed pids\n");
+#if VDRVERSNUM < 10500
 		m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->Ca(), m_Priority, m_Pids);
+#else
+		m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids);
+#endif
 		if (IsRunning() && m_Device != NULL) {
 			Dprintf("Attaching new receiver\n");
 			Attach();
diff --git a/server/livestreamer.h b/server/livestreamer.h
index 5c37d7f..0c525bf 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -26,7 +26,11 @@ protected:
 	virtual void Receive(uchar *Data, int Length);
 
 public:
+#if VDRVERSNUM < 10500
 	cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, int Ca, int Priority, const int *Pids);
+#else
+	cStreamdevLiveReceiver(cStreamdevLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids);
+#endif
 	virtual ~cStreamdevLiveReceiver();
 };