From ea431c2f184fa432ff03b1d77778eb3a21690df0 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 27 Dec 2012 21:00:37 +0100 Subject: [PATCH] Revert "spotify: Remove gst import from spotify.playback module" This reverts commit b4028e9c577c03277cfc39b24b070fd4868a3847. --- mopidy/backends/spotify/playback.py | 8 ++++++-- mopidy/backends/spotify/session_manager.py | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mopidy/backends/spotify/playback.py b/mopidy/backends/spotify/playback.py index 2937f881..d7e622fb 100644 --- a/mopidy/backends/spotify/playback.py +++ b/mopidy/backends/spotify/playback.py @@ -1,5 +1,9 @@ from __future__ import unicode_literals +import pygst +pygst.require('0.10') +import gst + import logging import functools @@ -35,7 +39,7 @@ class SpotifyPlaybackProvider(base.BasePlaybackProvider): self.backend.spotify.session.load( Link.from_string(track.uri).as_track()) self.backend.spotify.session.play(1) - self.backend.spotify.buffer_timestamp_in_ms = 0 + self.backend.spotify.buffer_timestamp = 0 self.audio.prepare_change() self.audio.set_appsrc( @@ -55,5 +59,5 @@ class SpotifyPlaybackProvider(base.BasePlaybackProvider): def on_seek_data(self, time_position): logger.debug('playback.on_seek_data(%d) called', time_position) - self.backend.spotify.buffer_timestamp_in_ms = time_position + self.backend.spotify.buffer_timestamp = time_position * gst.MSECOND self.backend.spotify.session.seek(time_position) diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index 6eba6f05..d372bfa4 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -46,7 +46,7 @@ class SpotifySessionManager(process.BaseThread, PyspotifySessionManager): self.backend_ref = backend_ref self.connected = threading.Event() - self.buffer_timestamp_in_ms = 0 + self.buffer_timestamp = 0 self.container_manager = None self.playlist_manager = None @@ -124,10 +124,10 @@ class SpotifySessionManager(process.BaseThread, PyspotifySessionManager): buffer_ = gst.Buffer(bytes(frames)) buffer_.set_caps(gst.caps_from_string(capabilites)) - buffer_.timestamp = self.buffer_timestamp_in_ms * gst.MSECOND - buffer_.duration = num_frames * gst.SECOND // sample_rate + buffer_.timestamp = self.buffer_timestamp + buffer_.duration = num_frames * gst.SECOND / sample_rate - self.buffer_timestamp_in_ms += buffer_.duration // gst.MSECOND + self.buffer_timestamp += buffer_.duration if self.audio.emit_data(buffer_).get(): return num_frames