diff options
author | TheTroll <trolldev@gmail.com> | 2010-03-18 01:07:28 +0100 |
---|---|---|
committer | TheTroll <trolldev@gmail.com> | 2010-03-18 01:07:28 +0100 |
commit | ef0bc7bd8c304fe13b941d62ff07da33f5f49315 (patch) | |
tree | 5c77fe376d8195e4ce0aae033121a98cd3004733 /bin/jsonapi.php | |
parent | 459abaa2386fd1935abf8b763aee046222b13a01 (diff) | |
download | istreamdev-ef0bc7bd8c304fe13b941d62ff07da33f5f49315.tar.gz istreamdev-ef0bc7bd8c304fe13b941d62ff07da33f5f49315.tar.bz2 |
Support audio streaming
Temporary video/audio sources
Diffstat (limited to 'bin/jsonapi.php')
-rwxr-xr-x | bin/jsonapi.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/bin/jsonapi.php b/bin/jsonapi.php index d4f96ac..b0e53cb 100755 --- a/bin/jsonapi.php +++ b/bin/jsonapi.php @@ -2,13 +2,13 @@ function getGlobals() { - global $vdrstreamdev, $vdrrecpath, $mediasource; + global $vdrstreamdev, $vdrrecpath, $mediasource, $videosource, $audiosource; $ret = array(); $ret['streamdev_server'] = $vdrstreamdev; $ret['rec_path'] = $vdrrecpath; - $ret['video_path'] = "/home/storage/Foot/"; - $ret['audio_path'] = "/home/www/mp3/"; + $ret['video_path'] = $videosource; + $ret['audio_path'] = $audiosource; return json_encode($ret); } @@ -167,4 +167,15 @@ function browseFolder($path) return json_encode($ret); } + +function streamAudio($path, $file) +{ + $ret = array(); + + $ret['track'] = streammusic($path, $file); + + return json_encode($ret); + +} + ?> |