From 6d2af1fac7bd066b75ebd237cc538e29fd21b729 Mon Sep 17 00:00:00 2001 From: TheTroll Date: Wed, 24 Feb 2010 14:16:31 +0100 Subject: 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) --- includes/include.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'includes/include.php') 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'); } -- cgit v1.2.3