diff options
author | TheTroll <trolldev@gmail.com> | 2010-02-24 14:16:31 +0100 |
---|---|---|
committer | TheTroll <trolldev@gmail.com> | 2010-02-24 14:16:31 +0100 |
commit | 6d2af1fac7bd066b75ebd237cc538e29fd21b729 (patch) | |
tree | d9e047923576b6c99cffc3dc66de5e4b77aa8789 /includes/include.php | |
parent | 626bd613fd2909cb83fe5b03a19f67a8a9f97d66 (diff) | |
download | istreamdev-6d2af1fac7bd066b75ebd237cc538e29fd21b729.tar.gz istreamdev-6d2af1fac7bd066b75ebd237cc538e29fd21b729.tar.bz2 |
Now support media sources instead of only one media path (see the $mediasources config variable)
Changed the way we browse dirs (with a mediapath and a subdir)
Diffstat (limited to 'includes/include.php')
-rwxr-xr-x | includes/include.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/include.php b/includes/include.php index 2bf7aa8..5985ffa 100755 --- a/includes/include.php +++ b/includes/include.php @@ -74,7 +74,9 @@ function selectpage() $qparams = $_REQUEST['qparams']; $category = $_REQUEST['category']; $url = $_REQUEST['url']; - start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url); + $mediapath = $_REQUEST['mediapath']; + $subdir = $_REQUEST['subdir']; + start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url, $mediapath, $subdir); break; default: gen_home(); @@ -129,7 +131,7 @@ function gen_edit_timer() -function start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url) +function start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url, $mediapath, $subdir) { global $httppath, $ffmpegpath, $segmenterpath; @@ -150,7 +152,7 @@ function start_stream($type, $name, $title, $desc, $qname, $qparams, $category, exec ($cmd); // Write streaminfo - writeinfostream($type, $name, $title, $desc, $qname, $category, $url); + writeinfostream($type, $name, $title, $desc, $qname, $category, $url, $mediapath, $subdir); include('includes/inc_stream.php'); } |