From 95a7856a6922967b5b0c97850404dd05537adc30 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Wed, 27 Aug 2008 00:39:04 +0200
Subject: Added a modified version of a patch provided for tntnet < 1.6.0.6 to
 enable streaming of recordings with vlc-plugin reported by Patrick Gaubatz.
 (cherry picked from commit 2dfc19d8b1dd857cdbbb9d360e05b59499d7e2c4)

---
 pages/vlc.ecpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pages/vlc.ecpp')

diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
index aea5560..d1afd67 100644
--- a/pages/vlc.ecpp
+++ b/pages/vlc.ecpp
@@ -108,7 +108,12 @@ using namespace vdrlive;
 		videourl = string("http://") + server + ":" + lexical_cast<string,int>(streamdevPort) + "/" + LiveSetup().GetStreamdevType() + "/" + *Channel->GetChannelID().ToString();
 	}
 	else {
-		videourl = string("http://") + server + "/recstream.html?recid=" + recid;
+#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;
 	}
 </%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