move crossfade control from settings widget to PlayControl plugin

maybe it should be hidden under an icon for extra prettiness

1 files changed, 9 insertions, 0 deletions

diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 5fad0e8..4bba711 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -38,6 +38,7 @@ class wgPlayControl(QtGui.QToolBar):
     outputs_menu = None
     p            = None
     logger       = None
+    xfade        = None
 
     class VolumeSlider(QtGui.QSlider):
 
@@ -108,12 +109,20 @@ class wgPlayControl(QtGui.QToolBar):
         self.p.mpclient.consume_changed.connect(self.consume.setChecked)
         self.consume.toggled.connect(self.p.mpclient.consume)
 
+        self.xfade = QtGui.QSpinBox(self)
+        self.xfade.setValue(self.p.mpclient.status['xfade'])
+        self.p.mpclient.crossfade_changed.connect(self.xfade.setValue)
+        self.xfade.valueChanged.connect(self.p.mpclient.crossfade)
+        self.xfade.setToolTip('Set crossfade between songs in seconds.')
+        self.addWidget(self.xfade)
+
         self.outputs_menu = QtGui.QMenu('Audio outputs')
         outputs           = self.addAction(QtGui.QIcon(':icons/outputs.png'), 'Audio outputs')
         outputs.triggered.connect(lambda : self.outputs_menu.popup(QtGui.QCursor.pos()))
         self.__update_outputs()
         self.p.mpclient.connect_changed.connect(self.__update_outputs)
 
+
         self.orientationChanged.connect(self.vol_slider.setOrientation)
 
         self.p.mpclient.state_changed.connect(self.onStateChange)