- removed legacy code for pre VDR 1.4

- dropped patches for pre VDR 1.4

6 files changed, 4 insertions, 49 deletions

diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 2829c13..0412d1f 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: connectionVTP.c,v 1.17 2008/03/13 16:01:18 schmirl Exp $
+ *  $Id: connectionVTP.c,v 1.18 2008/04/07 14:27:30 schmirl Exp $
  */
  
 #include "server/connectionVTP.h"
@@ -605,7 +605,6 @@ bool cConnectionVTP::CmdCAPS(char *Opts)
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
 
-#if VDRVERSNUM >= 10300
 	//
 	// Deliver section filters data in separate, channel-independent data stream
 	//
@@ -613,7 +612,6 @@ bool cConnectionVTP::CmdCAPS(char *Opts)
 		m_FiltersSupport = true;
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
-#endif
 
 	return Respond(561, "Capability \"%s\" not known", Opts);
 }
@@ -648,13 +646,8 @@ bool cConnectionVTP::CmdPORT(char *Opts)
 	if (ep == Opts || !isspace(*ep))
 		return Respond(500, "Use: PORT Id Destination");
 	
-#if VDRVERSNUM >= 10300
 	if (id != siLive && id != siLiveFilter)
 		return Respond(501, "Wrong connection id %d", id);
-#else
-	if (id != siLive)
-		return Respond(501, "Wrong connection id %d", id);
-#endif
 	
 	Opts = skipspace(ep);
 	n = 0;
@@ -681,7 +674,6 @@ bool cConnectionVTP::CmdPORT(char *Opts)
 
 	isyslog("Streamdev: Setting data connection to %s:%d", dataip, dataport);
 
-#if VDRVERSNUM >= 10300
 	if (id == siLiveFilter) {
 		m_FiltersSupport = true;
 		if(m_FilterStreamer)
@@ -703,7 +695,6 @@ bool cConnectionVTP::CmdPORT(char *Opts)
 
 		return Respond(220, "Port command ok, data connection opened");
 	}
-#endif
 
 	if(m_LiveSocket && m_LiveStreamer)
 		m_LiveStreamer->Stop();
@@ -746,14 +737,12 @@ bool cConnectionVTP::CmdTUNE(char *Opts)
 	if(m_LiveSocket)
 		m_LiveStreamer->Start(m_LiveSocket);
 	
-#if VDRVERSNUM >= 10300
 	if(m_FiltersSupport) {
 		if(!m_FilterStreamer)
 			m_FilterStreamer = new cStreamdevFilterStreamer;
 		m_FilterStreamer->SetDevice(dev);
 		//m_FilterStreamer->SetChannel(chan);
 	}
-#endif
 
 	return Respond(220, "Channel tuned");
 }
@@ -788,7 +777,6 @@ bool cConnectionVTP::CmdDELP(char *Opts)
 
 bool cConnectionVTP::CmdADDF(char *Opts) 
 {
-#if VDRVERSNUM >= 10300
 	int pid, tid, mask;
 	char *ep;
 
@@ -810,14 +798,10 @@ bool cConnectionVTP::CmdADDF(char *Opts)
 	return m_FilterStreamer->SetFilter(pid, tid, mask, true)
 			? Respond(220, "Filter %d transferring", pid)
 			: Respond(560, "Filter %d not available", pid);
-#else
-	return Respond(500, "ADDF known but unimplemented with VDR < 1.3.0");
-#endif
 }
 
 bool cConnectionVTP::CmdDELF(char *Opts) 
 {
-#if VDRVERSNUM >= 10307
 	int pid, tid, mask;
 	char *ep;
 	
@@ -838,9 +822,6 @@ bool cConnectionVTP::CmdDELF(char *Opts)
 
 	m_FilterStreamer->SetFilter(pid, tid, mask, false);
 	return Respond(220, "Filter %d stopped", pid);
-#else
-	return Respond(500, "DELF known but unimplemented with VDR < 1.3.0");
-#endif
 }
 
 bool cConnectionVTP::CmdABRT(char *Opts) 
@@ -857,12 +838,10 @@ bool cConnectionVTP::CmdABRT(char *Opts)
 		DELETENULL(m_LiveStreamer); 
 		DELETENULL(m_LiveSocket);
 		break;
-#if VDRVERSNUM >= 10300
 	case siLiveFilter:
 		DELETENULL(m_FilterStreamer);
 		DELETENULL(m_FilterSocket);
 		break;
-#endif
 	default:
 		return Respond(501, "Wrong connection id %d", id);
 		break;
diff --git a/server/livefilter.c b/server/livefilter.c
index e7d896c..ac9c284 100644
--- a/server/livefilter.c
+++ b/server/livefilter.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: livefilter.c,v 1.4 2007/04/24 11:06:12 schmirl Exp $
+ *  $Id: livefilter.c,v 1.5 2008/04/07 14:27:31 schmirl Exp $
  */
 
 #include "server/livefilter.h"
@@ -13,8 +13,6 @@
 #    define TS_SYNC_BYTE     0x47
 #endif
 
-#if VDRVERSNUM >= 10300
-
 cStreamdevLiveFilter::cStreamdevLiveFilter(cStreamdevStreamer *Streamer) {
 	m_Streamer = Streamer;
 }
@@ -41,5 +39,3 @@ void cStreamdevLiveFilter::Process(u_short Pid, u_char Tid, const u_char *Data,
 			m_Streamer->ReportOverflow(TS_SIZE - p);
 	}
 }
-
-#endif // VDRVERSNUM >= 10300
diff --git a/server/livefilter.h b/server/livefilter.h
index 99c69d4..13e8956 100644
--- a/server/livefilter.h
+++ b/server/livefilter.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: livefilter.h,v 1.4 2007/04/24 11:29:29 schmirl Exp $
+ *  $Id: livefilter.h,v 1.5 2008/04/07 14:27:31 schmirl Exp $
  */
 
 #ifndef VDR_STREAMEV_LIVEFILTER_H
@@ -7,8 +7,6 @@
 
 #include <vdr/config.h>
 
-#	if VDRVERSNUM >= 10300
-
 #include <vdr/filter.h>
 
 class cStreamdevStreamer;
@@ -31,5 +29,4 @@ public:
 	}
 };
 
-#	endif // VDRVERSNUM >= 10300
 #endif // VDR_STREAMEV_LIVEFILTER_H
diff --git a/server/livestreamer.c b/server/livestreamer.c
index 5e19d2b..63a0738 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -618,7 +618,6 @@ std::string cStreamdevLiveStreamer::Report(void)
 
 // --- cStreamdevFilterStreamer -------------------------------------------------
 
-#if VDRVERSNUM >= 10300
 cStreamdevFilterStreamer::cStreamdevFilterStreamer():
 		cStreamdevStreamer("streamdev-filterstreaming"),
 		m_Device(NULL),
@@ -720,5 +719,3 @@ void cStreamdevFilterStreamer::ChannelSwitch(const cDevice *Device, int ChannelN
 	}
 }
 #endif
-
-#endif // if VDRVERSNUM >= 10300
diff --git a/server/livestreamer.h b/server/livestreamer.h
index 57c3a90..dee509c 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -58,8 +58,6 @@ public:
 
 // --- cStreamdevFilterStreamer -------------------------------------------------
 
-#  if VDRVERSNUM >= 10300
-
 //#include <vdr/status.h>
 
 class cStreamdevLiveFilter;
@@ -85,6 +83,4 @@ public:
 	//virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
 };
 
-#  endif // if VDRVERSNUM >= 10300
-
 #endif // VDR_STREAMDEV_LIVESTREAMER_H
diff --git a/server/suspend.c b/server/suspend.c
index 8f6da38..541131c 100644
--- a/server/suspend.c
+++ b/server/suspend.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: suspend.c,v 1.1 2004/12/30 22:44:21 lordjaxom Exp $
+ *  $Id: suspend.c,v 1.2 2008/04/07 14:27:31 schmirl Exp $
  */
  
 #include "server/suspend.h"
@@ -7,9 +7,7 @@
 #include "common.h"
 
 cSuspendLive::cSuspendLive(void)
-#if VDRVERSNUM >= 10300
 		: cThread("Streamdev: server suspend")
-#endif
 {
 }
 
@@ -33,19 +31,11 @@ void cSuspendLive::Stop(void) {
 }
 
 void cSuspendLive::Action(void) {
-#if VDRVERSNUM < 10300
-	isyslog("Streamdev: Suspend Live thread started (pid = %d)", getpid());
-#endif
-
 	m_Active = true;
 	while (m_Active) {
 		DeviceStillPicture(suspend_mpg, sizeof(suspend_mpg));
 		usleep(100000);
 	}
-
-#if VDRVERSNUM < 10300
-	isyslog("Streamdev: Suspend Live thread stopped");
-#endif
 }
 
 bool cSuspendCtl::m_Active = false;