diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-06-11 05:16:20 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-06-11 05:16:20 +0000 |
commit | 689517e332c874ac09bb41398602622a1fc36af8 (patch) | |
tree | c97a077bd164e594211ed213405eb0cfbbf77b1c /modules | |
parent | 7327a025db941554501bbbe79c057fa308fb205c (diff) | |
download | ampache-689517e332c874ac09bb41398602622a1fc36af8.tar.gz ampache-689517e332c874ac09bb41398602622a1fc36af8.tar.bz2 ampache-689517e332c874ac09bb41398602622a1fc36af8.zip |
fixed preferences mostly, also fixed some genre issues and other stuff I am forgetting now
Diffstat (limited to 'modules')
-rw-r--r-- | modules/localplay/httpq.controller.php | 9 | ||||
-rw-r--r-- | modules/localplay/mpd.controller.php | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/localplay/httpq.controller.php b/modules/localplay/httpq.controller.php index b6d26445..184d6e81 100644 --- a/modules/localplay/httpq.controller.php +++ b/modules/localplay/httpq.controller.php @@ -30,20 +30,19 @@ class AmpacheHttpq { /* Constructed variables */ - var $_httpq; + private $_httpq; /** * Constructor * This returns the array map for the localplay object * REQUIRED for Localplay */ - function AmpacheHttpq() { + public function __construct() { /* Do a Require Once On the needed Libraries */ - require_once(conf('prefix') . '/modules/httpq/httpqplayer.class.php'); - - } // AmpacheHttpq + require_once Config::get('prefix') . '/modules/httpq/httpqplayer.class.php'; + } // Constructor /** * function_map diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php index c002d299..c38c8a63 100644 --- a/modules/localplay/mpd.controller.php +++ b/modules/localplay/mpd.controller.php @@ -30,17 +30,17 @@ class AmpacheMpd { /* Constructed variables */ - var $_mpd; + private $_mpd; /** * Constructor * This returns the array map for the localplay object * REQUIRED for Localplay */ - function AmpacheMpd() { + public function __construct() { /* Do a Require Once On the needed Libraries */ - require_once(conf('prefix') . '/modules/mpd/mpd.class.php'); + require_once Config::get('prefix') . '/modules/mpd/mpd.class.php'; } // AmpacheMpd @@ -51,7 +51,7 @@ class AmpacheMpd { * that this player supports and their names in this local * class. This is a REQUIRED function */ - function function_map() { + public function function_map() { $map = array(); |