diff options
| author | root <root@mediaserver.Belkin> | 2010-02-18 17:48:07 +0100 |
|---|---|---|
| committer | root <root@mediaserver.Belkin> | 2010-02-18 17:48:07 +0100 |
| commit | ee59e19183a839784e6ac30ed639548e4f36615e (patch) | |
| tree | ccb25718c32934f41368fa46dbc6083aae533fa6 /includes/include.php | |
| parent | 1f5be309fb11e8fa2070c186efe6037a03a9b572 (diff) | |
| download | istreamdev-ee59e19183a839784e6ac30ed639548e4f36615e.tar.gz istreamdev-ee59e19183a839784e6ac30ed639548e4f36615e.tar.bz2 | |
Second rev with media streaming. Now it works for all video types.
And some more bugfixes
Committer: Alib <aliboba@free.fr>
modified: HISTORY
modified: config.php
modified: css/style.css
modified: includes/inc_media.php
modified: includes/inc_rec.php
modified: includes/inc_stream.php
modified: includes/inc_vdr.php
modified: includes/include.php
modified: istream.sh
Diffstat (limited to 'includes/include.php')
| -rwxr-xr-x | includes/include.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/include.php b/includes/include.php index acffb58..05aa4b5 100755 --- a/includes/include.php +++ b/includes/include.php @@ -3,6 +3,7 @@ include ('config.php'); include ('includes/inc_auth.php'); include ('includes/inc_vdr.php'); +include ('includes/inc_files.php'); include ('includes/inc_streaminfo.php'); function selectpage() @@ -99,7 +100,7 @@ function start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now"; break; case 3: - $cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now"; + $cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now"; break; default: $cmd = ""; |