Merge lp:~cahr-gr/covergloobus/mpd into lp:covergloobus

[Alexandr Grigorcea]

[lp:~cahr-gr/covergloobus/mpd]

195. By Jordi Hernandez <jordi@vengance> on 2010-02-09

Merged with mpd branch

=== modified file 'src/covergloobus.py'
--- src/covergloobus.py	2010-01-26 19:13:19 +0000
+++ src/covergloobus.py	2010-02-08 16:52:13 +0000
@@ -162,6 +162,7 @@
 			self.player.set_handler(self.state_handler)
 			c.debug("Player loaded: " + p_name)
 		self.player.last_song = None
+		self.player.set_config(self.config)
 		if self.player.is_active():
 			self.player.active = self.player.connect()
 			state = self.player.get_state()
@@ -170,7 +171,6 @@
 				if state == 'playing' and self.UIManager.playercontrols_item:
 					self.UIManager.playercontrols_item.change_state('playing')
 			#self.change_song()
-		self.player.set_config(self.config)
     
 	# ============================== INIT DOCKY ============================ #
 	def init_docky(self):

=== modified file 'src/players/MPD.py'
--- src/players/MPD.py	2010-01-14 21:53:12 +0000
+++ src/players/MPD.py	2010-02-08 16:52:13 +0000
@@ -141,7 +141,10 @@
             Returns players actual state.
             @return: string - playing, paused, stopped
         """
-        status = self.client.status()
+        try:
+            status = self.client.status()
+        except:
+            return 'stopped'
         if status['state'] == 'play':
             return 'playing'
         if status['state'] == 'pause':