summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/jsonapi.php15
1 files changed, 7 insertions, 8 deletions
diff --git a/bin/jsonapi.php b/bin/jsonapi.php
index e825fec..a567808 100755
--- a/bin/jsonapi.php
+++ b/bin/jsonapi.php
@@ -2,24 +2,23 @@
function getGlobals()
{
- global $vdrstreamdev, $vdrrecpath, $mediasource, $videosource, $audiosource, $vdrenabled, $mediaenabled;
+ global $vdrstreamdev, $vdrrecpath, $mediasource, $videosource, $audiosource;
+ global $enablevdr, $enablemediavideo, $enablemediaaudio;
$ret = array();
- if ($vdrenabled)
+ if ($enablevdr)
$ret['streamdev_server'] = $vdrstreamdev;
else
$ret['streamdev_server'] = "";
$ret['rec_path'] = $vdrrecpath;
- if ($mediaenabled)
- {
+ if ($enablemediavideo)
$ret['video_path'] = $videosource;
- $ret['audio_path'] = $audiosource;
- }
else
- {
$ret['video_path'] = "";
+ if ($enablemediaaudio)
+ $ret['audio_path'] = $audiosource;
+ else
$ret['audio_path'] = "";
- }
return json_encode($ret);
}