switch to new-style PyQt4 signals.

1 files changed, 25 insertions, 12 deletions

diff --git a/nephilim/mpclient.py b/nephilim/mpclient.py
index ef8a4d0..ba3fd49 100644
--- a/nephilim/mpclient.py
+++ b/nephilim/mpclient.py
@@ -44,6 +44,19 @@ class MPClient(QtCore.QObject):
 
     logger      = None
 
+    # SIGNALS
+    connect_changed  = QtCore.pyqtSignal(bool)
+    db_updated       = QtCore.pyqtSignal()
+    song_changed     = QtCore.pyqtSignal(str)
+    time_changed     = QtCore.pyqtSignal(int)
+    state_changed    = QtCore.pyqtSignal(str)
+    volume_changed   = QtCore.pyqtSignal(int)
+    repeat_changed   = QtCore.pyqtSignal(bool)
+    random_changed   = QtCore.pyqtSignal(bool)
+    single_changed   = QtCore.pyqtSignal(bool)
+    consume_changed  = QtCore.pyqtSignal(bool)
+    playlist_changed = QtCore.pyqtSignal()
+
     def __init__(self):
         QtCore.QObject.__init__(self)
         self._cur_lib       = []
@@ -84,7 +97,7 @@ class MPClient(QtCore.QObject):
         self._db_update = self.stats()['db_update']
 
         self.emit(QtCore.SIGNAL('connected')) #should be removed
-        self.emit(QtCore.SIGNAL('connect_changed'), True)
+        self.connect_changed.emit(True)
         self.logger.info('Successfully connected to MPD.')
         self._timer_id    = self.startTimer(500)
         self._db_timer_id = self.startTimer(10000)
@@ -114,7 +127,7 @@ class MPClient(QtCore.QObject):
         self._cur_playlist = []
         self._commands     = []
         self.emit(QtCore.SIGNAL('disconnected')) #should be removed
-        self.emit(QtCore.SIGNAL('connect_changed'), False)
+        self.connect_changed.emit(False)
         self.logger.info('Disconnected from MPD.')
     def password(self, password):
         """Use the password to authenticate with MPD."""
@@ -408,7 +421,7 @@ class MPClient(QtCore.QObject):
                 self.logger.info('Database updated.')
                 self._db_update = db_update
                 self._update_lib()
-                self.emit(QtCore.SIGNAL('db_updated'))
+                self.db_updated.emit()
             return
 
 
@@ -421,29 +434,29 @@ class MPClient(QtCore.QObject):
         self._update_current_song()
 
         if self._status['songid'] != old_status['songid']:
-            self.emit(QtCore.SIGNAL('song_changed'), self._status['songid'])
+            self.song_changed.emit(self._status['songid'])
 
         if self._status['time'] != old_status['time']:
-            self.emit(QtCore.SIGNAL('time_changed'), self._status['time'])
+            self.time_changed.emit(self._status['time'])
 
         if self._status['state'] != old_status['state']:
-            self.emit(QtCore.SIGNAL('state_changed'), self._status['state'])
+            self.state_changed.emit(self._status['state'])
 
         if self._status['volume'] != old_status['volume']:
-            self.emit(QtCore.SIGNAL('volume_changed'), int(self._status['volume']))
+            self.volume_changed.emit( int(self._status['volume']))
 
         if self._status['repeat'] != old_status['repeat']:
-            self.emit(QtCore.SIGNAL('repeat_changed'), bool(self._status['repeat']))
+            self.repeat_changed.emit(bool(self._status['repeat']))
 
         if self._status['random'] != old_status['random']:
-            self.emit(QtCore.SIGNAL('random_changed'), bool(self._status['random']))
+            self.random_changed.emit(bool(self._status['random']))
 
         if self._status['single'] != old_status['single']:
-            self.emit(QtCore.SIGNAL('single_changed'), bool(self._status['single']))
+            self.single_changed.emit(bool(self._status['single']))
 
         if self._status['consume'] != old_status['consume']:
-            self.emit(QtCore.SIGNAL('consume_changed'), bool(self._status['consume']))
+            self.consume_changed.emit(bool(self._status['consume']))
 
         if self._status['playlist'] != old_status['playlist']:
             self._update_playlist()
-            self.emit(QtCore.SIGNAL('playlist_changed'))
+            self.playlist_changed.emit()