diff options
| author | Matthias Kortstiege <matthias (at) kortstiege (dot) net> | 2008-12-10 14:51:56 +0100 |
|---|---|---|
| committer | Matthias Kortstiege <matthias (at) kortstiege (dot) net> | 2008-12-10 14:51:56 +0100 |
| commit | 4a486de7c9db11591840c451ebb84c3ac1b2e8b9 (patch) | |
| tree | ccb56ed3b06e1ad6121f04e1cb08418752fa8a12 /pages | |
| parent | 1adde56cbfb3fd20736650c4a35e351272545b0d (diff) | |
| download | vdr-plugin-live-4a486de7c9db11591840c451ebb84c3ac1b2e8b9.tar.gz vdr-plugin-live-4a486de7c9db11591840c451ebb84c3ac1b2e8b9.tar.bz2 | |
updated ssl patch
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/vlc.ecpp | 11 |
1 files changed, 2 insertions, 9 deletions
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 $>" /> |