diff options
| author | TheTroll <trolldev@gmail.com> | 2010-04-02 18:38:50 +0200 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-04-02 18:38:50 +0200 |
| commit | 31f59e914e3c2ce50221bfb124356f635a7446f7 (patch) | |
| tree | bd42054d12a5da7c699de10227189937a2e28755 /bin | |
| parent | 171598d1b8f47667062168ece78b73d05a5faeb3 (diff) | |
| download | istreamdev-31f59e914e3c2ce50221bfb124356f635a7446f7.tar.gz istreamdev-31f59e914e3c2ce50221bfb124356f635a7446f7.tar.bz2 | |
Fixed istream.sh launch on some systems
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/istream.sh | 8 | ||||
| -rw-r--r-- | bin/session.php | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/istream.sh b/bin/istream.sh index a05a63e..41520af 100755 --- a/bin/istream.sh +++ b/bin/istream.sh @@ -41,7 +41,7 @@ fi cd ../ram/$SESSION # Create a fifo -2>/dev/null mkfifo ./fifo +mkfifo ./fifo if [ ! -z "$FILES" ] then @@ -64,12 +64,12 @@ then SPID=`\ps ax --format pid,cmd,ppid | grep "$FFPID$" | grep -v cat | awk {'print $1'}`; if [ ! -z "$SPID" ] then - 2>/dev/null echo $SPID > ./ffmpeg.pid + echo $SPID > ./ffmpeg.pid fi fi # Now start segmenter -(trap "rm -f ./segmenter.pid; cat ./fifo" EXIT HUP INT TERM ABRT; 2>/dev/null $SEGMENTERPATH ./fifo $SEGDUR stream stream.m3u8 $HTTP_PATH$SESSION/ $SEGWIN) & +(trap "rm -f ./segmenter.pid; cat ./fifo" EXIT HUP INT TERM ABRT; $SEGMENTERPATH ./fifo $SEGDUR stream stream.m3u8 $HTTP_PATH$SESSION/ $SEGWIN) & # Store segmenter pid SEGPID=$! @@ -78,6 +78,6 @@ then SPID=`\ps ax --format pid,cmd,ppid | grep "$SEGPID$" | grep segmenter | awk {'print $1'}`; if [ ! -z "$SPID" ] then - 2>/dev/null echo $SPID > ./segmenter.pid + echo $SPID > ./segmenter.pid fi fi diff --git a/bin/session.php b/bin/session.php index e854058..6a104dc 100644 --- a/bin/session.php +++ b/bin/session.php @@ -82,13 +82,13 @@ function sessioncreate($type, $url, $mode) switch ($type) { case 'tv': - $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null &"; + $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null 2>&1 &"; break; case 'rec': - $cmd = "./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"" .$url ."/0* \" >/dev/null &"; + $cmd = "./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"" .$url ."/0* \" >/dev/null 2>&1 &"; break; case 'vid': - $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null &"; + $cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" \"\" >/dev/null 2>&1 &"; break; default: $cmd = ""; |