From df22256f096ef3e541d1a5a07ca9250668d2647a Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sat, 21 Aug 2010 23:25:38 +0200
Subject: [PATCH] Review gstreamer-local-backend branch

---
 mopidy/backends/base/playback.py  |  4 ++--
 mopidy/backends/local/__init__.py |  9 ++++-----
 mopidy/outputs/gstreamer.py       |  2 +-
 mopidy/settings.py                | 12 +++++++-----
 tests/backends/base.py            |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index 2b5d7478..933424ad 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -442,8 +442,8 @@ class BasePlaybackController(object):
         :type time_position: int
         :rtype: :class:`True` if successful, else :class:`False`
         """
-        # FIXME I think return value is only realy usefull for internal
-        # testing, as such it should probably not be exposed in api.
+        # FIXME I think return value is only really useful for internal
+        # testing, as such it should probably not be exposed in API.
         if self.state == self.STOPPED:
             self.play()
         elif self.state == self.PAUSED:
diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py
index bd8a4301..e9e86f34 100644
--- a/mopidy/backends/local/__init__.py
+++ b/mopidy/backends/local/__init__.py
@@ -1,14 +1,13 @@
-import logging
-import os
 import glob
-import shutil
+import logging
 import multiprocessing
+import os
+import shutil
 
 from mopidy import settings
 from mopidy.backends.base import *
 from mopidy.models import Playlist, Track, Album
-from mopidy import settings
-from mopidy.process import pickle_connection
+from mopidy.utils.process import pickle_connection
 
 from .translator import parse_m3u, parse_mpd_tag_cache
 
diff --git a/mopidy/outputs/gstreamer.py b/mopidy/outputs/gstreamer.py
index 667b815b..453747d6 100644
--- a/mopidy/outputs/gstreamer.py
+++ b/mopidy/outputs/gstreamer.py
@@ -194,7 +194,7 @@ class GStreamerProcess(BaseProcess):
 
     def set_position(self, position):
         self.gst_pipeline.get_state() # block until state changes are done
-        handeled= self.gst_pipeline.seek_simple(gst.Format(gst.FORMAT_TIME),
+        handeled = self.gst_pipeline.seek_simple(gst.Format(gst.FORMAT_TIME),
             gst.SEEK_FLAG_FLUSH, position * gst.MSECOND)
         self.gst_pipeline.get_state() # block until seek is done
         return handeled
diff --git a/mopidy/settings.py b/mopidy/settings.py
index 4268f059..699eb16a 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -51,6 +51,13 @@ DUMP_LOG_FILENAME = u'dump.log'
 #:     Currently only the first frontend in the list is used.
 FRONTENDS = (u'mopidy.frontends.mpd.MpdFrontend',)
 
+#: Which GStreamer audio sink to use in :mod:`mopidy.outputs.gstreamer`.
+#:
+#: Default::
+#:
+#:     GSTREAMER_AUDIO_SINK = u'autoaudiosink'
+GSTREAMER_AUDIO_SINK = u'autoaudiosink'
+
 #: Path to folder with local music.
 #:
 #: Used by :mod:`mopidy.backends.local`.
@@ -163,8 +170,3 @@ SPOTIFY_USERNAME = u''
 #:
 #: Used by :mod:`mopidy.backends.libspotify`.
 SPOTIFY_PASSWORD = u''
-
-#: Which GStreamer audio sink to use in output pipeline.
-#:
-#: Default: autoaudiosink
-GSTREAMER_AUDIO_SINK = u'autoaudiosink'
diff --git a/tests/backends/base.py b/tests/backends/base.py
index e6c10a5a..e9b78453 100644
--- a/tests/backends/base.py
+++ b/tests/backends/base.py
@@ -1,9 +1,9 @@
+import multiprocessing
 import os
 import random
 import shutil
 import tempfile
 import time
-import multiprocessing
 
 from mopidy import settings
 from mopidy.mixers.dummy import DummyMixer