From: Kristoffer Grönlund <kristoffer.gronlund@purplescout.se>
Date: Wed, 30 Dec 2009 11:52:57 +0000 (+0100)
Subject: We have sound!
X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=commitdiff_plain;h=a232e40c933066ab11acfcfeef348c0cd504f35e

We have sound!
---

diff --git a/jamaui/player.py b/jamaui/player.py
index 563484d..f2ae37b 100644
--- a/jamaui/player.py
+++ b/jamaui/player.py
@@ -74,7 +74,9 @@ class GStreamer(_Player):
         # On maemo use software decoding to workaround some bugs their gst:
         # 1. Weird volume bugs in playbin when playing ogg or wma files
         # 2. When seeking the DSPs sometimes lie about the real position info
-        if util.platform == 'maemo':
+        if True:
+            self._maemo_setup_playbin_player(uri)
+        elif util.platform == 'maemo':
             if not self._maemo_setup_hardware_player(filetype):
                 self._maemo_setup_software_player()
                 log.debug( 'Using software decoding (maemo)' )
@@ -119,6 +121,14 @@ class GStreamer(_Player):
             self.player.set_state(gst.STATE_NULL)
             self.player = None
 
+    def _maemo_setup_playbin_player(self, url):
+        self.player = gst.parse_launch("playbin2 uri=%s" % (url,))
+        self.filesrc = self.player
+        self.filesrc_property = 'uri'
+        self.volume_control = self.player
+        self.volume_multiplier = 1.
+        self.volume_property = 'volume'
+
     def _maemo_setup_hardware_player( self, filetype ):
         """ Setup a hardware player for mp3 or aac audio using
         dspaacsink or dspmp3sink """
@@ -296,9 +306,9 @@ if util.platform == 'maemo':
             states = ("playing", "paused", "stopped")
             self.__state = state if state in states else 'none'
 
-    PlayerBackend = OssoPlayer
-else:
-    PlayerBackend = GStreamer
+#    PlayerBackend = OssoPlayer
+#else:
+PlayerBackend = GStreamer
 
 class Playlist(object):
     class Entry(object):