summaryrefslogtreecommitdiff
path: root/bin/jsonapi.php
diff options
context:
space:
mode:
authorTheTroll <trolldev@gmail.com>2010-03-23 19:36:11 +0100
committerTheTroll <trolldev@gmail.com>2010-03-23 19:36:11 +0100
commit7d8bc8ba0454d704bb7be03909a31d0c01a4be1a (patch)
tree1c4474f58d230c79ac42b168393d3058a453fd9d /bin/jsonapi.php
parentb1195b4cf5bdfbd807fcb33c8096528f7b4503dc (diff)
downloadistreamdev-7d8bc8ba0454d704bb7be03909a31d0c01a4be1a.tar.gz
istreamdev-7d8bc8ba0454d704bb7be03909a31d0c01a4be1a.tar.bz2
renamed features enables
Diffstat (limited to 'bin/jsonapi.php')
-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);
}