How have I let this be broken on Maemo 4.1?

[watersofshiloah] / src / player.py

diff --git a/src/player.py b/src/player.py
index b1871cd..2326a63 100644 (file)
--- a/src/player.py
+++ b/src/player.py
@@ -4,10 +4,15 @@ import gobject
 
 import util.misc as misc_utils
 try:
-       import stream as _stream
-       stream = _stream # Silence PyFlakes
+       import stream_gst
+       stream = stream_gst
 except ImportError:
-       import stream_gst as stream
+       try:
+               import stream_osso
+               stream = stream_osso
+       except ImportError:
+               import stream_null
+               stream = stream_null
 import stream_index
 import call_monitor
 
@@ -35,9 +40,9 @@ class Player(gobject.GObject):
                ),
        }
 
-       STATE_PLAY = stream.GSTStream.STATE_PLAY
-       STATE_PAUSE = stream.GSTStream.STATE_PAUSE
-       STATE_STOP = stream.GSTStream.STATE_STOP
+       STATE_PLAY = stream.Stream.STATE_PLAY
+       STATE_PAUSE = stream.Stream.STATE_PAUSE
+       STATE_STOP = stream.Stream.STATE_STOP
 
        def __init__(self, index):
                gobject.GObject.__init__(self)
@@ -48,7 +53,7 @@ class Player(gobject.GObject):
                self._calls = call_monitor.CallMonitor()
                self._calls.connect("call_start", self._on_call_start)
 
-               self._stream = stream.GSTStream()
+               self._stream = stream.Stream()
                self._stream.connect("state-change", self._on_stream_state)
                self._stream.connect("eof", self._on_stream_eof)
                self._stream.connect("error", self._on_stream_error)