summaryrefslogtreecommitdiff
path: root/nephilim/winMain.py
diff options
context:
space:
mode:
Diffstat (limited to 'nephilim/winMain.py')
-rw-r--r--nephilim/winMain.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index c8ae92a..865f98f 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -55,6 +55,7 @@ class winMain(QtGui.QMainWindow):
self.__time_slider.setMaximumWidth(self.width()/4)
self.__time_slider.sliderReleased.connect( self.__on___time_slider_change)
self.__time_label = TimeLabel(self, mpclient)
+ self.mpclient.time_changed.connect(self.__on_time_change)
self.statusBar().addWidget(self.__statuslabel)
self.statusBar().addPermanentWidget(self.__time_label)
@@ -98,7 +99,6 @@ class winMain(QtGui.QMainWindow):
self.mpclient.connect_changed.connect(self.__on_connect_changed)
self.mpclient.song_changed.connect(self.__on_song_change)
self.mpclient.state_changed.connect(self.__update_state_messages)
- self.mpclient.time_changed.connect(self.__on_time_change)
self.__update_state_messages()
self.show()
@@ -166,8 +166,8 @@ class winMain(QtGui.QMainWindow):
def __update_state_messages(self):
"""Update window title and statusbar"""
- song = self.mpclient.current_song()
- state = self.mpclient.status()['state']
+ song = self.mpclient.cur_song
+ state = self.mpclient.status['state']
state = 'playing' if state == 'play' else 'paused' if state == 'pause' else 'stopped'
if song:
self.setWindowTitle('%s by %s - %s [%s]'%(song['?title'], song['?artist'], APPNAME, state))
@@ -180,8 +180,8 @@ class winMain(QtGui.QMainWindow):
self.mpclient.seek(self.__time_slider.value())
def __on_song_change(self):
- status = self.mpclient.status()
- self.__time_slider.setMaximum(status['length'])
+ status = self.mpclient.status
+ self.__time_slider.setMaximum(status['time'][1])
self.__time_slider.setEnabled(True)
self.__update_state_messages()
@@ -199,8 +199,8 @@ class TimeLabel(QtGui.QLabel):
self._mpclient = mpclient
self._mpclient.time_changed.connect(self._update_text)
- self._update_text(self._mpclient.status()['time'])
+ self._update_text(self._mpclient.status['time'][0])
@Slot(int)
def _update_text(self, time):
- self.setText('%s/%s'%(sec2min(time), sec2min(self._mpclient.status()['length'])))
+ self.setText('%s/%s'%(sec2min(time), sec2min(self._mpclient.status['time'][1])))