From 7be2c7248a0b29ea74e8e36db405d5974995a57b Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 21 Jun 2010 16:25:16 +0100
Subject: going for generic property updates

---
 src/mpris-controller.vala | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/mpris-controller.vala')

diff --git a/src/mpris-controller.vala b/src/mpris-controller.vala
index cd1d2db..98473ad 100644
--- a/src/mpris-controller.vala
+++ b/src/mpris-controller.vala
@@ -54,7 +54,7 @@ public class MprisController : GLib.Object
 
 	private void onTrackChange(dynamic DBus.Object mpris_client, HashTable<string,Value?> ht)
 	{
-		this.controller.update_playing_info(format_metadata(ht));
+		this.controller.update_playing_info(MetadataMenuitem.format_updates(ht));
 	}
 
 	/**
@@ -85,16 +85,5 @@ public class MprisController : GLib.Object
 		//int repeat = ar.get_nth(2).get_int();
 		//int endless = ar.get_nth(3).get_int();		
 	}
-
-	private static HashMap<string, string> format_metadata(HashTable<string,Value?> data)
-	{
-		HashMap<string,string> results = new HashMap<string, string>();
-		debug("format_metadata - title = %s", (string)data.lookup("title"));
-		results.set("title", (string)data.lookup("title"));
-    results.set("artist", (string)data.lookup("artist"));
-    results.set("album", (string)data.lookup("album"));
-    results.set("arturl", (string)data.lookup("arturl"));
-		return results;                          				
-	}
 	
 }
-- 
cgit v1.2.3