From 3b53981b41a59c7935e372a56737c14857432bae Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Wed, 10 Dec 2008 18:44:40 +0100
Subject: ssl patches by Matthias (asg)

---
 pages/vlc.ecpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'pages/vlc.ecpp')

diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
index d1afd67..db2a74d 100644
--- a/pages/vlc.ecpp
+++ b/pages/vlc.ecpp
@@ -96,9 +96,7 @@ using namespace vdrlive;
 <%cpp>
 #if TNTVERSION >= 1606
 	string server = request.getHost();
-	if (Channel != 0) {
-		server = server.substr(0, server.rfind(':'));
-	}
+	server = server.substr(0, server.rfind(':'));
 #else
 	string server = request.getServerIp();
 #endif
@@ -108,12 +106,7 @@ using namespace vdrlive;
 		videourl = string("http://") + server + ":" + lexical_cast<string,int>(streamdevPort) + "/" + LiveSetup().GetStreamdevType() + "/" + *Channel->GetChannelID().ToString();
 	}
 	else {
-#if TNTVERSION >= 1606
-#  define SERVER_AND_PORT server
-#else
-#  define SERVER_AND_PORT server + ":" + lexical_cast<string,int>(LiveSetup().GetServerPort());
-#endif
-		videourl = string("http://") + SERVER_AND_PORT + "/recstream.html?recid=" + recid;
+		videourl = string("http://") + server + ":" + lexical_cast<string,int>(LiveSetup().GetServerPort()) + "/recstream.html?recid=" + recid;
 	}
 </%cpp>
 			<embed type="application/x-vlc-plugin" pluginspage="http://www.videolan.org/" version="VideoLAN.VLCPlugin.2" id="video1" name="video1" autoplay="yes" loop="no" width="720" height="576" target="<$ videourl $>" />
-- 
cgit v1.2.3