[banshee] Mpris: Change trackid type from string to DBus object path

[Bertrand Lorentz <blorentz src gnome org>]

commit 21baabf5ec6ba2fdfe0f68647af53c4e1d9961b6
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Wed Nov 30 20:28:04 2011 +0100

    Mpris: Change trackid type from string to DBus object path
    
    This follows a clarification of the MPRIS spec. We were already
    formatting the track id as an object path, but we need to actually type
    it as such (dbus type 'o'). This changes both the Metadata map and the
    SetPosition method.

 .../Banshee.Mpris/Banshee.Mpris/IPlayer.cs         |    2 +-
 .../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs     |    4 ++--
 .../Banshee.Mpris/Banshee.Mpris/Metadata.cs        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs b/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs
index 9bbf5db..5649c7b 100644
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/IPlayer.cs
@@ -62,7 +62,7 @@ namespace Banshee.Mpris
         void Stop ();
         void Play ();
         void Seek (long offset);
-        void SetPosition (string trackid, long position);
+        void SetPosition (ObjectPath trackid, long position);
         void OpenUri (string uri);
     }
 }
diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
index c8c8aaa..082063d 100644
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
@@ -288,13 +288,13 @@ namespace Banshee.Mpris
             engine_service.Play ();
         }
 
-        public void SetPosition (string trackid, long position)
+        public void SetPosition (ObjectPath trackid, long position)
         {
             if (!CanSeek) {
                 return;
             }
 
-            if (String.IsNullOrEmpty (trackid) || trackid != (string)Metadata["mpris:trackid"]) {
+            if (trackid == null || trackid != (ObjectPath)Metadata["mpris:trackid"]) {
                 return;
             }
 
diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris/Metadata.cs b/src/Extensions/Banshee.Mpris/Banshee.Mpris/Metadata.cs
index 6f3514c..33414af 100644
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/Metadata.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/Metadata.cs
@@ -53,7 +53,7 @@ namespace Banshee.Mpris
             }
 
             // The trackid must be formatted like a dbus object path
-            data_store["mpris:trackid"] = String.Concat (object_path, track.CacheModelId, track.CacheEntryId);
+            data_store["mpris:trackid"] = new DBus.ObjectPath (String.Concat (object_path, track.CacheModelId, track.CacheEntryId));
             SetInfo ("mpris:length", (long)track.Duration.TotalMilliseconds * 1000);
             SetInfo ("xesam:url", track.Uri.ToString ());
             SetInfo ("xesam:title", track.TrackTitle);