From f9738cfe51da2e3dd0533398e51079f8487b7ff5 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Thu, 11 Dec 2008 00:34:34 +0100 Subject: Preserved enhancements lost by the previous ssl patch --- pages/vlc.ecpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp index db2a74d..d1afd67 100644 --- a/pages/vlc.ecpp +++ b/pages/vlc.ecpp @@ -96,7 +96,9 @@ using namespace vdrlive; <%cpp> #if TNTVERSION >= 1606 string server = request.getHost(); - server = server.substr(0, server.rfind(':')); + if (Channel != 0) { + server = server.substr(0, server.rfind(':')); + } #else string server = request.getServerIp(); #endif @@ -106,7 +108,12 @@ using namespace vdrlive; videourl = string("http://") + server + ":" + lexical_cast(streamdevPort) + "/" + LiveSetup().GetStreamdevType() + "/" + *Channel->GetChannelID().ToString(); } else { - videourl = string("http://") + server + ":" + lexical_cast(LiveSetup().GetServerPort()) + "/recstream.html?recid=" + recid; +#if TNTVERSION >= 1606 +# define SERVER_AND_PORT server +#else +# define SERVER_AND_PORT server + ":" + lexical_cast(LiveSetup().GetServerPort()); +#endif + videourl = string("http://") + SERVER_AND_PORT + "/recstream.html?recid=" + recid; } -- cgit v1.2.3