[rygel] playbin: Set renderer state according to playbin state changes

[Jens Georg <jensgeorg src gnome org>]

commit 06a46bd580598a10121594dc42f717e6c11df99e
Author: Jens Georg <mail jensge org>
Date:   Fri Jun 8 10:34:09 2012 +0200

    playbin: Set renderer state according to playbin state changes
    
    This allows the playbin to be controlled externally while the renderer still
    has the proper UPnP state.
    
    There's an issue that setting "NULL" or "READY" on a playbin does not generate
    a state-change message on the bus.

 src/plugins/playbin/rygel-playbin-player.vala |   59 +++++++++++++++++++++----
 1 files changed, 50 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/playbin/rygel-playbin-player.vala b/src/plugins/playbin/rygel-playbin-player.vala
index e2842f2..150b7a4 100644
--- a/src/plugins/playbin/rygel-playbin-player.vala
+++ b/src/plugins/playbin/rygel-playbin-player.vala
@@ -80,18 +80,36 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
         }
 
         set {
+            Gst.State state, pending;
+
+            this.playbin.get_state (out state, out pending, Gst.MSECOND);
+
             debug ("Changing playback state to %s.", value);
-            this._playback_state = value;
 
-            switch (this._playback_state) {
+            switch (value) {
                 case "STOPPED":
-                    this.playbin.set_state (State.NULL);
+                    // bgo#TBD: Does not generate a state-change event
+                    if (state != State.NULL || pending != State.VOID_PENDING) {
+                        this.playbin.set_state (State.NULL);
+                    }
+                    this._playback_state = value;
                 break;
                 case "PAUSED_PLAYBACK":
-                    this.playbin.set_state (State.PAUSED);
+                    if (state != State.PAUSED || pending != State.VOID_PENDING) {
+                        this._playback_state = "TRANSITIONING";
+                        this.playbin.set_state (State.PAUSED);
+                    } else {
+                        this._playback_state = value;
+                    }
                 break;
                 case "PLAYING":
-                    this.playbin.set_state (State.PLAYING);
+                    if (state != State.PLAYING ||
+                        pending != State.VOID_PENDING) {
+                        this._playback_state = "TRANSITIONING";
+                        this.playbin.set_state (State.PLAYING);
+                    } else {
+                        this._playback_state = value;
+                    }
                 break;
                 default:
                 break;
@@ -112,7 +130,8 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
             if (value != "") {
                 switch (this._playback_state) {
                     case "NO_MEDIA_PRESENT":
-                        this.playback_state = "STOPPED";
+                        this._playback_state = "STOPPED";
+                        this.notify_property ("playback-state");
                         break;
                     case "STOPPED":
                     case "PAUSED_PLAYBACK":
@@ -124,7 +143,8 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
                         break;
                 }
             } else {
-                this.playback_state = "NO_MEDIA_PRESENT";
+                this._playback_state = "NO_MEDIA_PRESENT";
+                this.notify_property ("playback-state");
             }
             debug ("URI set to %s.", value);
         }
@@ -270,12 +290,33 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
         switch (message.type) {
         case MessageType.STATE_CHANGED:
             if (message.src == this.playbin) {
-                State old_state, new_state;
+                State old_state, new_state, pending;
 
-                message.parse_state_changed (out old_state, out new_state, null);
+                message.parse_state_changed (out old_state,
+                                             out new_state,
+                                             out pending);
                 if (old_state == State.READY && new_state == State.PAUSED) {
                     this.notify_property ("duration");
                 }
+
+                debug ("%d %d %d", old_state, new_state, pending);
+
+                if (pending == State.VOID_PENDING) {
+                    switch (new_state) {
+                        case State.PAUSED:
+                            this.playback_state = "PAUSED_PLAYBACK";
+                            break;
+                        case State.NULL:
+                        case State.READY:
+                            this.playback_state = "STOPPED";
+                            break;
+                        case State.PLAYING:
+                            this.playback_state = "PLAYING";
+                            break;
+                        default:
+                            assert_not_reached ();
+                    }
+                }
             }
             break;
         case MessageType.EOS: