From 1b9837ab2ddfac074149d020e700e9272579b211 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 21 Jun 2010 11:36:58 +0100
Subject: lots of changes

---
 src/metadata-menu-item.vala | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/metadata-menu-item.vala')

diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala
index 82926b1..28e034a 100644
--- a/src/metadata-menu-item.vala
+++ b/src/metadata-menu-item.vala
@@ -1,21 +1,23 @@
 using Dbusmenu;
 using Gee;
+using CommonDefs;
 
-public class MetadataMenuitem : Dbusmenu.Menuitem
+public class MetadataMenuitem : PlayerItem
 {
 	/* Not ideal duplicate definition of const - see common-defs/h */
- 	const string DBUSMENU_METADATA_MENUITEM_TYPE = "x-canonical-metadata-menu-item";
- 	const string DBUSMENU_METADATA_MENUITEM_TEXT_ARTIST = "x-canonical-metadata-text-artist";
- 	const string DBUSMENU_METADATA_MENUITEM_TEXT_PIECE = "x-canonical-metadata-text-piece";
- 	const string DBUSMENU_METADATA_MENUITEM_TEXT_CONTAINER = "x-canonical-metadata-text-container";
-	const string DBUSMENU_METADATA_MENUITEM_IMAGE_PATH = "x-canonical-metadata-image";
+ 	//const string DBUSMENU_METADATA_MENUITEM_TYPE = "x-canonical-metadata-menu-item";
+ 	//const string DBUSMENU_METADATA_MENUITEM_TEXT_ARTIST = "x-canonical-metadata-text-artist";
+ 	//const string DBUSMENU_METADATA_MENUITEM_TEXT_TITLE = "x-canonical-metadata-text-title";
+ 	//const string DBUSMENU_METADATA_MENUITEM_TEXT_ALBUM = "x-canonical-metadata-text-album";
+	//const string DBUSMENU_METADATA_MENUITEM_IMAGE_PATH = "x-canonical-metadata-image";
 
 	public MetadataMenuitem()
   {
 		this.property_set(MENUITEM_PROP_TYPE, DBUSMENU_METADATA_MENUITEM_TYPE);
+		
 	}
 
-	public void update(HashMap<string, string> data)
+	public override void update(HashMap<string, string> data)
 	{
 		this.property_set(DBUSMENU_METADATA_MENUITEM_TEXT_ARTIST, data.get("artist").strip());
 		this.property_set(DBUSMENU_METADATA_MENUITEM_TEXT_PIECE, data.get("title").strip());
@@ -37,4 +39,16 @@ public class MetadataMenuitem : Dbusmenu.Menuitem
 	{
 		debug("MetadataItem -> handle event caught!");
 	}	
+
+	public static HashMap<string, Type> attributes()
+	{
+		HashMap<string, Type> result = new HashMap<string, Type>();
+		result.set(DBUSMENU_METADATA_MENUITEM_TEXT_ARTIST, typeof(string));
+		result.set("x-canonical-metadata-text-title", typeof(string));
+		result.set("x-canonical-metadata-text-album", typeof(string));
+		result.set("x-canonical-metadata-text-image", typeof(string));
+		
+		return result;
+	}
+	
 }
\ No newline at end of file
-- 
cgit v1.2.3