summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorinfamy <infamy@ampache>2006-06-17 19:12:09 +0000
committerinfamy <infamy@ampache>2006-06-17 19:12:09 +0000
commitec9af7f83ee9b2e6756b364ffb22e89e4f657575 (patch)
treee98984b8e3e3127e5fbeac04f20900e079b2a478
parent4600df647f86a15d3bc26c3428d9f169141a2301 (diff)
downloadampache-ec9af7f83ee9b2e6756b364ffb22e89e4f657575.tar.gz
ampache-ec9af7f83ee9b2e6756b364ffb22e89e4f657575.tar.bz2
ampache-ec9af7f83ee9b2e6756b364ffb22e89e4f657575.zip
Some clean ups of the code and changed volume to volume_set
-rw-r--r--modules/localplay/xbmc.controller.php32
1 files changed, 16 insertions, 16 deletions
diff --git a/modules/localplay/xbmc.controller.php b/modules/localplay/xbmc.controller.php
index b80b1910..213f9027 100644
--- a/modules/localplay/xbmc.controller.php
+++ b/modules/localplay/xbmc.controller.php
@@ -48,24 +48,24 @@ class AmpacheXBMC {
$map = array();
/* Required Functions */
- $map['add'] = 'add_songs'; //done
- $map['delete'] = 'delete_songs'; //done
- $map['play'] = 'play'; //done
- $map['stop'] = 'stop'; //done
- $map['get'] = 'get_songs';
- $map['status'] = 'get_status'; //done
- $map['connect'] = 'connect'; //done
+ $map['add'] = 'add_songs';
+ $map['delete'] = 'delete_songs';
+ $map['play'] = 'play';
+ $map['stop'] = 'stop';
+ $map['get'] = 'get_songs';
+ $map['status'] = 'get_status';
+ $map['connect'] = 'connect';
/* Recommended Functions */
- $map['next'] = 'next'; //done
- $map['prev'] = 'prev'; //done
- $map['pause'] = 'pause'; //done
- $map['volume'] = 'volume'; //done
+ $map['next'] = 'next';
+ $map['prev'] = 'prev';
+ $map['pause'] = 'pause';
+ $map['volume_set'] = 'volume_set';
/* Optional Functions */
- $map['delete_all'] = 'clear_playlist';//done
- $map['shutdown'] = 'xbmc_shutdown';//done
+ $map['delete_all'] = 'clear_playlist';
+ $map['shutdown'] = 'xbmc_shutdown';
return $map;
@@ -135,8 +135,8 @@ class AmpacheXBMC {
$preferences = array();
- $preferences[] = array('name'=>'hostname','default'=>'localhost','type'=>'string','description'=>'XBOX Hostname');
- $preferences[] = array('name'=>'smbpath','default'=>'smb://athena/public2/mp3/sorted/','type'=>'string','description'=>'Samba share path to mp3s');
+ $preferences[] = array('name'=>'hostname','default'=>'xbox','type'=>'string','description'=>'XBOX Hostname');
+ $preferences[] = array('name'=>'smbpath','default'=>'smb://hostname/mp3/','type'=>'string','description'=>'Samba share path to mp3s');
//needed to add basic authentication support later
//$preferences[] = array('name'=>'username','default'=>'xbox','type'=>'string','description'=>'XBMC Username');
@@ -287,7 +287,7 @@ class AmpacheXBMC {
* volume
* This tells XBMC to set the volume to the parameter
*/
- function volume($volume) {
+ function volume_set($volume) {
if ($this->XBMCCmd("SetVolume",$volume)!="OK") { return false; }
return true;