diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-10-07 17:48:16 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2008-10-07 17:48:16 +0200 |
| commit | ef13f1efbf3ddd5db63c2c76d3fd89d72f3f926f (patch) | |
| tree | 4e9d3fdffc282836658e94e5c7c331d1ea0faac2 | |
| parent | fc8388894e21b6deb712dcfb5449ed6a14ab99bb (diff) | |
| parent | 95a7856a6922967b5b0c97850404dd05537adc30 (diff) | |
| download | vdr-plugin-live-ef13f1efbf3ddd5db63c2c76d3fd89d72f3f926f.tar.gz vdr-plugin-live-ef13f1efbf3ddd5db63c2c76d3fd89d72f3f926f.tar.bz2 | |
Merge commit 'tadi/master'
| -rw-r--r-- | pages/vlc.ecpp | 7 |
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 $>" /> |