clPlugin: get rid of CamelCase.

1 files changed, 21 insertions, 22 deletions

diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 3ff7170..d6eebb5 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -44,7 +44,7 @@ class wgPlayControl(QtGui.QToolBar):
             painter.fillRect(rect, QtGui.QBrush(grad))
 
     def __init__(self, p, parent = None):
-        QtGui.QToolBar.__init__(self, p.getName(), parent)
+        QtGui.QToolBar.__init__(self, p.name(), parent)
         self.setMovable(True)
         self.p = p
 
@@ -59,12 +59,12 @@ class wgPlayControl(QtGui.QToolBar):
         self.random = QtGui.QPushButton(QtGui.QIcon('gfx/random.png'), '', self)
         self.random.setToolTip('Random')
         self.random.setCheckable(True)
-        self.connect(self.random, QtCore.SIGNAL('toggled(bool)'), self.p.mpclient.random)
+        self.connect(self.random, QtCore.SIGNAL('toggled(bool)'), self.p.mpclient().random)
 
         self.repeat = QtGui.QPushButton(QtGui.QIcon('gfx/repeat.png'), '', self)
         self.repeat.setToolTip('Repeat')
         self.repeat.setCheckable(True)
-        self.connect(self.repeat, QtCore.SIGNAL('toggled(bool)'), self.p.mpclient.repeat)
+        self.connect(self.repeat, QtCore.SIGNAL('toggled(bool)'), self.p.mpclient().repeat)
 
         self.addWidget(self.btnPlayPause)
         self.addWidget(self.btnStop)
@@ -85,7 +85,7 @@ class wgPlayControl(QtGui.QToolBar):
         self.queuedSongs.extend(songs)
 
     def onStateChange(self, params):
-        status = self.p.mpclient.status()
+        status = self.p.mpclient().status()
 
         if status['state'] == 'play':
             self.btnPlayPause.changeIcon('gfx/media-playback-pause.svg')
@@ -98,27 +98,27 @@ class wgPlayControl(QtGui.QToolBar):
         self.slrVolume.setValue(params['newVolume'])
 
     def onBtnPlayPauseClick(self):
-        status=self.p.mpclient.status()
+        status=self.p.mpclient().status()
         if status['state']=='play':
-            self.p.mpclient.pause()
+            self.p.mpclient().pause()
             logging.info("Toggling playback")
         elif status['state']=='stop':
-            self.p.mpclient.play(None)
+            self.p.mpclient().play(None)
             logging.info("Pausing playback")
         else:
-            self.p.mpclient.resume()
+            self.p.mpclient().resume()
     def onBtnStopClick(self):
-        self.p.mpclient.stop()
+        self.p.mpclient().stop()
         logging.info("Stopping playback")
     def onBtnPreviousClick(self):
-        self.p.mpclient.previous()
+        self.p.mpclient().previous()
         logging.info("Playing previous")
     def onBtnNextClick(self):
-        self.p.mpclient.next()
+        self.p.mpclient().next()
         logging.info("Playing next")
     def onVolumeSliderChange(self):
         v=self.slrVolume.value()
-        self.p.mpclient.set_volume(v)
+        self.p.mpclient().set_volume(v)
         if v<=1:
             mode='mute'
         else:
@@ -128,13 +128,13 @@ class wgPlayControl(QtGui.QToolBar):
     def saveQueue(self):
         # save the ids as a list of space-separated numbers
         logging.info("saving queue")
-        self.p.settings.setValue(self.p.getName() + '/queue', QVariant(str(self.queuedSongs)[1:-1].replace(',', '')))
+        self.p.settings().setValue(self.p.name() + '/queue', QVariant(str(self.queuedSongs)[1:-1].replace(',', '')))
     def loadQueue(self):
         # just read all the numbers!
         logging.info("loading queue")
         self.queuedSongs=[]
         i=0
-        ids=self.p.settings.value(self.p.getName() + '/queue').toString().split(' ')
+        ids=self.p.settings().value(self.p.name() + '/queue').toString().split(' ')
         for id in ids:
             try:
                 self.queuedSongs.append(int(id))
@@ -143,19 +143,17 @@ class wgPlayControl(QtGui.QToolBar):
 
 class PlayControl(Plugin):
     o=None
-    DEFAULTS = {'queue'   : ''}
-    def __init__(self, winMain):
-        Plugin.__init__(self, winMain, 'PlayControl')
-        self.addListener('onStateChange', self.onStateChange)
-        self.addListener('onVolumeChange', self.onVolumeChange)
-        self.addListener('onReady', self.onStateChange)
+    DEFAULTS  = {'queue'   : ''}
+    LISTENERS = {'onStateChange' : 'onStateChange', 'onVolumeChange' : 'onVolumeChange',
+                 'onReady' : 'onStateChange'}
+
     def _load(self):
         self.o = wgPlayControl(self, None)
         self.o.loadQueue()
-        self.winMain.addToolBar(QtCore.Qt.TopToolBarArea, self.o)
+        self.parent().addToolBar(QtCore.Qt.TopToolBarArea, self.o)
     def _unload(self):
         self.o.saveQueue()
-        self.winMain.removeToolBar(self.o)
+        self.parent().removeToolBar(self.o)
         self.o = None
     def getInfo(self):
         return "Have total control over the playing!"
@@ -167,3 +165,4 @@ class PlayControl(Plugin):
         self.o.onStateChange(params)
     def onVolumeChange(self, params):
         self.o.onVolumeChange(params)
+