diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-05 08:07:00 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-05 08:07:00 +0000 |
commit | b611d2e0a3c4b3e67273478baa4138e3bf47c7b4 (patch) | |
tree | 4b402e7465e121035a37c875b4ee296e83ad5dc2 /lib | |
parent | 2e340028710ec8cb83defc02dce6bcd0c6993d01 (diff) | |
download | ampache-b611d2e0a3c4b3e67273478baa4138e3bf47c7b4.tar.gz ampache-b611d2e0a3c4b3e67273478baa4138e3bf47c7b4.tar.bz2 ampache-b611d2e0a3c4b3e67273478baa4138e3bf47c7b4.zip |
* Added echo of pattern on print tags
* Tweaked headers on ajax page
* Fixed quick search box issues on browse by song
* Reverted to text for browse by albums
* Fixed some bad error handling on localplay
Diffstat (limited to 'lib')
-rw-r--r-- | lib/class/localplay.class.php | 3 | ||||
-rw-r--r-- | lib/class/stream.class.php | 14 | ||||
-rw-r--r-- | lib/init.php | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php index ba5c3c2a..8729b2df 100644 --- a/lib/class/localplay.class.php +++ b/lib/class/localplay.class.php @@ -80,7 +80,8 @@ class Localplay { if (!$include) { /* Throw Error Here */ - + debug_event('localplay','Unable to load ' . $this->type . ' controller','2'); + return false; } // include else { $class_name = "Ampache" . $this->type; diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 1f6f3fb5..c505b380 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -315,8 +315,18 @@ class Stream { */ function create_localplay() { - $localplay = init_localplay(); - $localplay->connect(); + if (!$localplay = init_localplay()) { + debug_event('localplay','Player failed to init on song add','3'); + echo "Error: Localplay Init Failed check config"; + return false; + } + + if (!$localplay->connect()) { + debug_event('localplay','Localplay Player Connect failed','3'); + echo "Error: Localplay connect failed check config"; + return false; + } + $localplay->add($this->songs); /* Check for Support */ diff --git a/lib/init.php b/lib/init.php index 5e96e204..ba0c06d9 100644 --- a/lib/init.php +++ b/lib/init.php @@ -67,7 +67,7 @@ if (!$results = read_config($configfile,0)) { } /** This is the version.... fluf nothing more... **/ -$results['version'] = '3.3.3-Beta3 (Build 003)'; +$results['version'] = '3.3.3-Beta3'; $results['raw_web_path'] = $results['web_path']; $results['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['web_path']; |