[gnome-music] Another attempt to fix crashes on scrolling to the end of the song

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit 5a2425c9f2067fc21fef9d47b0351b179324d7c2
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Mon Apr 29 16:13:30 2013 +0200

    Another attempt to fix crashes on scrolling to the end of the song

 src/player.js |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/src/player.js b/src/player.js
index 4e8f82c..524856a 100644
--- a/src/player.js
+++ b/src/player.js
@@ -97,11 +97,14 @@ const Player = new Lang.Class({
         this.player = Gst.ElementFactory.make("playbin", "player");
         this.player.connect("about-to-finish", Lang.bind(this,
             function() {
+                if (this.timeout) {
+                    GLib.source_remove(this.timeout);
+                }
                 if (!this.playlist || !this.currentTrack || !this.playlist.iter_next(this.currentTrack))
                     this.currentTrack=null;
                 else {
                     this.load( this.playlist.get_value( this.currentTrack, this.playlist_field));
-                    this.progress_scale.set_value(0.0);
+                    this.timeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 1000, Lang.bind(this, 
this._updatePositionCallback));
                 }
                 return true;
             }));
@@ -165,6 +168,9 @@ const Player = new Lang.Class({
     },
 
     play: function() {
+        if (this.timeout) {
+            GLib.source_remove(this.timeout);
+        }
         this.play_btn.set_active(true);
         if(this.player.get_state(1)[1] != Gst.State.PAUSED) {
             this.stop();
@@ -454,17 +460,24 @@ const Player = new Lang.Class({
 
     _updatePositionCallback: function() {
         let seconds = Math.floor(this.progress_scale.get_value() / 60);
-        this.progress_scale.set_value((seconds+ 1) * 60);
+        this.progress_scale.set_value((seconds + 1) * 60);
         return true;
     },
 
     onProgressScaleChangeValue: function(scroll) {
         var seconds = scroll.get_value() / 60;
-        if(seconds <= this.duration) {
+        if(seconds != this.duration) {
             this.player.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT, seconds * 
1000000000);
+        } else {
+            let duration = this.player.query_duration(Gst.Format.TIME, null);
+            if (duration) {
+                // Rewind a second back before the track end
+                this.player.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT, 
duration[1]-1000000000);
+                //this.about_to_finish();
+            }
         }
 
-        return false;
+        return true;
      },
 });
 Signals.addSignalMethods(Player.prototype);