From 8c038bbae616180095a1a831346f17136e0790bf Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Wed, 5 Sep 2012 20:48:00 +0200
Subject: [PATCH] Review cleanup.

---
 mopidy/backends/spotify/playback.py | 2 +-
 mopidy/gstreamer.py                 | 4 ++--
 mopidy/mixers/auto.py               | 6 +++---
 mopidy/mixers/fake.py               | 2 +-
 mopidy/utils/settings.py            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mopidy/backends/spotify/playback.py b/mopidy/backends/spotify/playback.py
index 116be285..70cc4617 100644
--- a/mopidy/backends/spotify/playback.py
+++ b/mopidy/backends/spotify/playback.py
@@ -43,7 +43,7 @@ class SpotifyPlaybackProvider(BasePlaybackProvider):
         return result
 
     def get_volume(self):
-        return self.backend.gstreamer.get_volume()
+        return self.backend.gstreamer.get_volume().get()
 
     def set_volume(self, volume):
         self.backend.gstreamer.set_volume(volume)
diff --git a/mopidy/gstreamer.py b/mopidy/gstreamer.py
index 7bf5f370..3e538ccc 100644
--- a/mopidy/gstreamer.py
+++ b/mopidy/gstreamer.py
@@ -44,8 +44,8 @@ class GStreamer(ThreadingActor):
 
         self._setup_pipeline()
         self._setup_output(output or settings.OUTPUT)
-        self._setup_mixer(mixer or settings.MIXER,
-                          mixer_track or settings.MIXER_TRACK)
+        self._setup_mixer(
+            mixer or settings.MIXER, mixer_track or settings.MIXER_TRACK)
         self._setup_message_processor()
 
     def _setup_pipeline(self):
diff --git a/mopidy/mixers/auto.py b/mopidy/mixers/auto.py
index 4b4ce543..f4bd0f92 100644
--- a/mopidy/mixers/auto.py
+++ b/mopidy/mixers/auto.py
@@ -31,10 +31,10 @@ class AutoAudioMixer(gst.Bin):
         factories.sort(key=lambda f: (-f.get_rank(), f.get_name()))
 
         for factory in factories:
-            # Avoid sink/srcs that implment mixing.
+            # Avoid sink/srcs that implement mixing.
             if factory.get_klass() != 'Generic/Audio':
                 continue
-            # Avoid anything that doesn't implment mixing.
+            # Avoid anything that doesn't implement mixing.
             elif not factory.has_interface('GstMixer'):
                 continue
 
@@ -69,4 +69,4 @@ class AutoAudioMixer(gst.Bin):
 
 
 gobject.type_register(AutoAudioMixer)
-gst.element_register (AutoAudioMixer, 'autoaudiomixer', gst.RANK_MARGINAL)
+gst.element_register(AutoAudioMixer, 'autoaudiomixer', gst.RANK_MARGINAL)
diff --git a/mopidy/mixers/fake.py b/mopidy/mixers/fake.py
index de0f6a50..b697956a 100644
--- a/mopidy/mixers/fake.py
+++ b/mopidy/mixers/fake.py
@@ -77,4 +77,4 @@ class FakeMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
 
 
 gobject.type_register(FakeMixer)
-gst.element_register (FakeMixer, 'fakemixer', gst.RANK_MARGINAL)
+gst.element_register(FakeMixer, 'fakemixer', gst.RANK_MARGINAL)
diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py
index edda0222..726917c6 100644
--- a/mopidy/utils/settings.py
+++ b/mopidy/utils/settings.py
@@ -152,7 +152,7 @@ def validate_settings(defaults, settings):
 
         elif setting == 'OUTPUTS':
             errors[setting] = (
-                u'Deprecated setting, please change to OUTPUT. OUTPUT expectes '
+                u'Deprecated setting, please change to OUTPUT. OUTPUT expects '
                 u'a GStreamer bin description string for your desired output.')
 
         elif setting == 'SPOTIFY_BITRATE':