- added gettext support (thanks to Rolf Ahrenberg)

- added vdr-1.6.0-ignore_missing_cam patch
- dropped obsolete respect_ca patch
- removed legacy code for < VDR 1.5.9 (thanks to Rolf Ahrenberg)

1 files changed, 0 insertions, 14 deletions

diff --git a/server/livestreamer.c b/server/livestreamer.c
index 63a0738..dd65e65 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -27,23 +27,13 @@ protected:
 	virtual void Receive(uchar *Data, int Length);
 
 public:
-#if VDRVERSNUM < 10500
-	cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, int Ca, int Priority, const int *Pids);
-#else
 	cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids);
-#endif
 	virtual ~cStreamdevLiveReceiver();
 };
 
-#if VDRVERSNUM < 10500
-cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, int Ca, 
-                                               int Priority, const int *Pids):
-		cReceiver(Ca, Priority, 0, Pids),
-#else
 cStreamdevLiveReceiver::cStreamdevLiveReceiver(cStreamdevStreamer *Streamer, tChannelID ChannelID, 
                                                int Priority, const int *Pids):
 		cReceiver(ChannelID, Priority, 0, Pids),
-#endif
 		m_Streamer(Streamer)
 {
 }
@@ -434,11 +424,7 @@ void cStreamdevLiveStreamer::StartReceiver(void)
 	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();