diff options
| author | Alib <aliboba@free.fr> | 2010-02-22 11:43:27 +0100 |
|---|---|---|
| committer | Alib <aliboba@free.fr> | 2010-02-22 11:43:27 +0100 |
| commit | 3afb9d31e43ffd6e37dd988247b0e94422855f87 (patch) | |
| tree | 9dfbd7b439c0181db1e5cef8d9de39237763ecc0 /includes | |
| parent | d7a0b351167c289cbd3918a912235ff839230960 (diff) | |
| download | istreamdev-3afb9d31e43ffd6e37dd988247b0e94422855f87.tar.gz istreamdev-3afb9d31e43ffd6e37dd988247b0e94422855f87.tar.bz2 | |
- fixed img position for thumbs
- added segmenter binary to be configurable
Diffstat (limited to 'includes')
| -rwxr-xr-x | includes/include.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/include.php b/includes/include.php index e7d46ab..4810227 100755 --- a/includes/include.php +++ b/includes/include.php @@ -124,18 +124,18 @@ function gen_edit_timer() function start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url) { - global $httppath, $ffmpegpath; + global $httppath, $ffmpegpath, $segmenterpath; switch ($type) { case 1: - $cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." \" | at now"; + $cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." \" | at now"; break; case 2: - $cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now"; + $cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." \" | 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 ." " .$segmenterpath ." \" | at now"; break; default: $cmd = ""; |