From c18f7d47e72f0223f1ed3e94aaf94c553ff9846c Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Sun, 17 Nov 2013 11:20:42 +0100
Subject: Disabled PS remuxer which is said to produce anything but PS

---
 server/connectionHTTP.c | 8 +++++---
 server/connectionVTP.c  | 2 ++
 server/livestreamer.c   | 2 ++
 server/menuHTTP.c       | 4 ++++
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'server')

diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c
index ef8b6ed..ce004a6 100644
--- a/server/connectionHTTP.c
+++ b/server/connectionHTTP.c
@@ -585,10 +585,12 @@ bool cConnectionHTTP::ProcessURI(const std::string& PathInfo)
 	// Streamtype with leading / stripped off
 	std::string type = PathInfo.substr(1, PathInfo.find_first_of("/;", 1) - 1);
 	const char* pType = type.c_str();
-	if (strcasecmp(pType, "PS") == 0) {
-		m_StreamType = stPS;
-	} else if (strcasecmp(pType, "PES") == 0) {
+	if (strcasecmp(pType, "PES") == 0) {
 		m_StreamType = stPES;
+#ifdef STREAMDEV_PS
+	} else if (strcasecmp(pType, "PS") == 0) {
+		m_StreamType = stPS;
+#endif
 	} else if (strcasecmp(pType, "TS") == 0) {
 		m_StreamType = stTS;
 	} else if (strcasecmp(pType, "ES") == 0) {
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 087d02d..31906cf 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -872,10 +872,12 @@ bool cConnectionVTP::CmdCAPS(char *Opts)
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
 
+#ifdef STREAMDEV_PS
 	if (strcasecmp(Opts, "PS") == 0) {
 		m_StreamType = stPS;
 		return Respond(220, "Capability \"%s\" accepted", Opts);
 	}
+#endif
 
 	if (strcasecmp(Opts, "PES") == 0) {
 		m_StreamType = stPES;
diff --git a/server/livestreamer.c b/server/livestreamer.c
index 8ae9437..07f7273 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -496,9 +496,11 @@ bool cStreamdevLiveStreamer::SetChannel(const cChannel *Channel, eStreamType Str
 		m_Remux = new cTS2PESRemux(m_Channel->Vpid(), Apids, Dpids, m_Channel->Spids());
 		return SetPids(m_Channel->Vpid(), Apids, Dpids, m_Channel->Spids());
 
+#ifdef STREAMDEV_PS
 	case stPS:  
 		m_Remux = new cTS2PSRemux(m_Channel->Vpid(), Apids, Dpids, m_Channel->Spids());
 		return SetPids(m_Channel->Vpid(), Apids, Dpids, m_Channel->Spids());
+#endif
 
 	case stEXT:
 		m_Remux = new cExternRemux(Connection(), m_Channel, Apids, Dpids);
diff --git a/server/menuHTTP.c b/server/menuHTTP.c
index a66573e..e512c4b 100644
--- a/server/menuHTTP.c
+++ b/server/menuHTTP.c
@@ -260,8 +260,10 @@ std::string cHtmlMenuList::StreamTypeMenu()
 	std::string typeMenu;
 	typeMenu += (streamType == stTS ? (std::string) "[TS] " :
 			(std::string) "[<a href=\"/TS/" + self + "\">TS</a>] ");
+#ifdef STREAMDEV_PS
 	typeMenu += (streamType == stPS ? (std::string) "[PS] " :
 			(std::string) "[<a href=\"/PS/" + self + "\">PS</a>] ");
+#endif
 	typeMenu += (streamType == stPES ? (std::string) "[PES] " :
 			(std::string) "[<a href=\"/PES/" + self + "\">PES</a>] ");
 	typeMenu += (streamType == stES ? (std::string) "[ES] " :
@@ -402,7 +404,9 @@ std::string cHtmlMenuList::ItemText()
 
 	switch (streamType) {
 		case stTS: suffix = (std::string) ".ts"; break;
+#ifdef STREAMDEV_PS
 		case stPS: suffix = (std::string) ".vob"; break;
+#endif
 		// for Network Media Tank
 		case stPES: suffix = (std::string) ".vdr"; break; 
 		default: suffix = "";
-- 
cgit v1.2.3