[gnome-music/wip/mschraal/player-factor-out-gstreamer] player: Move more functionality to smoothscale
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/player-factor-out-gstreamer] player: Move more functionality to smoothscale
- Date: Sun, 18 Feb 2018 15:52:47 +0000 (UTC)
commit f7d256c5189eef51ff55ea3a71c8aebc4c53d796
Author: Marinus Schraal <mschraal gnome org>
Date: Sat Feb 17 16:11:33 2018 +0100
player: Move more functionality to smoothscale
gnomemusic/player.py | 12 ++----------
gnomemusic/widgets/smoothscale.py | 13 ++++++++++---
2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index d950902..7224ef3 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -369,11 +369,9 @@ class Player(GObject.GObject):
@log
def load(self, media):
- self._progress_scale._progress_scale_zero()
self._set_duration(media.get_duration())
self._total_time_label.set_label(
utils.seconds_to_string(media.get_duration()))
- self._progress_scale.set_sensitive(True)
self._play_button.set_sensitive(True)
self._sync_prev_next()
@@ -449,8 +447,6 @@ class Player(GObject.GObject):
elif (self.repeat == RepeatType.NONE):
self.stop()
self._play_button.set_image(self._play_image)
- self._progress_scale._progress_scale_zero()
- self._progress_scale.set_sensitive(False)
if self.playlist is not None:
current_track = self.playlist.get_path(
self.playlist.get_iter_first())
@@ -469,8 +465,6 @@ class Player(GObject.GObject):
# Stop playback
self.stop()
self._play_button.set_image(self._play_image)
- self._progress_scale._progress_scale_zero()
- self._progress_scale.set_sensitive(False)
self.emit('playback-status-changed')
@log
@@ -532,8 +526,8 @@ class Player(GObject.GObject):
position = self._player.position
if position >= 5:
- self._progress_scale._progress_scale_zero()
- self._progress_scale._on_progress_scale_change_value(self._progress_scale)
+ self._player.seek(0)
+ self._player.state = Playback.PLAYING
return
self.stop()
@@ -700,8 +694,6 @@ class Player(GObject.GObject):
@log
def Stop(self):
- self._progress_scale._progress_scale_zero()
- self._progress_scale.set_sensitive(False)
self._play_button.set_image(self._play_image)
self.stop()
self.emit('playback-status-changed')
diff --git a/gnomemusic/widgets/smoothscale.py b/gnomemusic/widgets/smoothscale.py
index 6cae907..dd6bff9 100644
--- a/gnomemusic/widgets/smoothscale.py
+++ b/gnomemusic/widgets/smoothscale.py
@@ -91,6 +91,12 @@ class SmoothScale(Gtk.Scale):
self._previous_state = state
+ if state == Playback.STOPPED:
+ self.set_value(0)
+ self.set_sensitive(False)
+ else:
+ self.set_sensitive(True)
+
if state == Playback.PLAYING:
self._update_timeout()
else:
@@ -140,9 +146,10 @@ class SmoothScale(Gtk.Scale):
return False
def _on_progress_value_changed(self, widget):
- seconds = int(self.get_value() / 60)
- #self._progress_time_label.set_label(utils.seconds_to_string(seconds))
- return False
+ # seconds = int(self.get_value() / 60)
+ # self._progress_time_label.set_label(utils.seconds_to_string(seconds))
+ # return False
+ pass
@log
def _on_progress_scale_event(self, scale, data):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]