summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheTroll <trolldev@gmail.com>2010-03-23 18:26:55 +0100
committerTheTroll <trolldev@gmail.com>2010-03-23 18:26:55 +0100
commit1d65873e24c1d2d572a68586902d101de60b6d65 (patch)
treee27ba234e724f853d8be695c45eb164cf712100b
parent967faa4dd1c94769995aec1cde6878490d03756c (diff)
downloadistreamdev-1d65873e24c1d2d572a68586902d101de60b6d65.tar.gz
istreamdev-1d65873e24c1d2d572a68586902d101de60b6d65.tar.bz2
changes options name
-rwxr-xr-xbin/jsonapi.php4
-rwxr-xr-xconfig_default.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/jsonapi.php b/bin/jsonapi.php
index fc39434..bdbe430 100755
--- a/bin/jsonapi.php
+++ b/bin/jsonapi.php
@@ -5,12 +5,12 @@ function getGlobals()
global $vdrstreamdev, $vdrrecpath, $mediasource, $videosource, $audiosource, $vdrenable, $mediaenable;
$ret = array();
- if ($vdrenable)
+ if ($vdrenabled)
$ret['streamdev_server'] = $vdrstreamdev;
else
$ret['streamdev_server'] = "";
$ret['rec_path'] = $vdrrecpath;
- if ($mediaenable)
+ if ($mediaenabled)
{
$ret['video_path'] = $videosource;
$ret['audio_path'] = $audiosource;
diff --git a/config_default.php b/config_default.php
index af87a2f..b421482 100755
--- a/config_default.php
+++ b/config_default.php
@@ -5,7 +5,7 @@
$httppath = '/istreamdev/'; // Absolute path to the index.php file. //Don't put http://yourdomain !!
// VDR configuration
- $vdrenable=1; // Enable/disable VDR feature
+ $vdrenabled=1; // Enable/disable VDR feature
$vdrchannels='/etc/vdr/channels.conf'; // VDR channel list
$svdrpport=2001; // SVDRP port
$svdrpip='127.0.0.1'; // SVDRP ip
@@ -13,7 +13,7 @@
$vdrrecpath='/video/'; //VDR recording directory
// Media configuration
- $mediaenable=1; //Enable/disable media streaming feature
+ $mediaenabled=1; //Enable/disable media streaming feature
$videotypes='avi mkv ts mov mp4 wmv flv mpg mpeg mpeg2 mpv '; // Supported video extensions (must finish with a space)
$audiotypes='mp3 aac wav '; // Supported audio extensions
$videosource = '/mnt/media/movies/'; // Video files directory