From 7254a6752808830d5fc133e5362da6c47f3f84ff Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Thu, 2 Dec 2010 09:43:13 +0100
Subject: Snapshot 2009-06-11

---
 server/connectionVTP.c | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'server/connectionVTP.c')

diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 2829c13..e0edb6e 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.19 2009/01/16 11:35:44 schmirl Exp $
  */
  
 #include "server/connectionVTP.h"
@@ -595,17 +595,18 @@ bool cConnectionVTP::CmdCAPS(char *Opts)
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
 
+#if APIVERSNUM < 10703
 	if (strcasecmp(Opts, "PES") == 0) {
 		m_StreamType = stPES;
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
+#endif
 
 	if (strcasecmp(Opts, "EXTERN") == 0) {
 		m_StreamType = stExtern;
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
 
-#if VDRVERSNUM >= 10300
 	//
 	// Deliver section filters data in separate, channel-independent data stream
 	//
@@ -613,7 +614,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 +648,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 +676,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 +697,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 +739,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 +779,6 @@ bool cConnectionVTP::CmdDELP(char *Opts)
 
 bool cConnectionVTP::CmdADDF(char *Opts) 
 {
-#if VDRVERSNUM >= 10300
 	int pid, tid, mask;
 	char *ep;
 
@@ -810,14 +800,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 +824,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 +840,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;
-- 
cgit v1.2.3