summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-08-27 00:39:04 +0200
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2008-08-27 00:46:14 +0200
commit95a7856a6922967b5b0c97850404dd05537adc30 (patch)
treebc6bb41a56a4a3e367249c7bb25858421fba0866 /pages
parent51b76ff70da78db1b056ca8bb9c379e391bfd87b (diff)
downloadvdr-plugin-live-95a7856a6922967b5b0c97850404dd05537adc30.tar.gz
vdr-plugin-live-95a7856a6922967b5b0c97850404dd05537adc30.tar.bz2
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)
Diffstat (limited to 'pages')
-rw-r--r--pages/vlc.ecpp7
1 files changed, 6 insertions, 1 deletions
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 $>" />