From: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
Date: Wed, 2 Dec 2009 14:45:09 +0000 (+0200)
Subject: tracker: Use term "picture" rather than "image"
X-Git-Tag: RYGEL_0_5_0~164
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1df114ada2d7478b04cc904656f53dd92fd9f2b;p=profile%2Fivi%2Frygel.git

tracker: Use term "picture" rather than "image"
---

diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index da8120e..6d3b3b9 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -22,7 +22,7 @@ librygel_media_tracker_la_SOURCES = \
 				    rygel-tracker-item-factory.vala \
 				    rygel-tracker-video-item-factory.vala \
 				    rygel-tracker-music-item-factory.vala \
-				    rygel-tracker-image-item-factory.vala \
+				    rygel-tracker-picture-item-factory.vala \
 				    rygel-tracker-plugin.vala \
 				    rygel-tracker-plugin-factory.vala \
 				    rygel-tracker-interfaces.vala
diff --git a/src/plugins/tracker/rygel-tracker-image-item-factory.vala b/src/plugins/tracker/rygel-tracker-picture-item-factory.vala
similarity index 75%
rename from src/plugins/tracker/rygel-tracker-image-item-factory.vala
rename to src/plugins/tracker/rygel-tracker-picture-item-factory.vala
index 975c1d9..147e48e 100644
--- a/src/plugins/tracker/rygel-tracker-image-item-factory.vala
+++ b/src/plugins/tracker/rygel-tracker-picture-item-factory.vala
@@ -25,10 +25,10 @@ using GUPnP;
 using DBus;
 
 /**
- * Tracker image item factory.
+ * Tracker picture item factory.
  */
-public class Rygel.TrackerImageItemFactory : Rygel.TrackerItemFactory {
-    private enum ImageMetadata {
+public class Rygel.TrackerPictureItemFactory : Rygel.TrackerItemFactory {
+    private enum PictureMetadata {
         HEIGHT = Metadata.LAST_KEY,
         WIDTH,
 
@@ -37,7 +37,7 @@ public class Rygel.TrackerImageItemFactory : Rygel.TrackerItemFactory {
 
     private const string CATEGORY = "nmm:Photo";
 
-    public TrackerImageItemFactory () {
+    public TrackerPictureItemFactory () {
         base (CATEGORY, MediaItem.IMAGE_CLASS);
     }
 
@@ -48,11 +48,11 @@ public class Rygel.TrackerImageItemFactory : Rygel.TrackerItemFactory {
                                       throws GLib.Error {
         var item = base.create (id, uri, parent, metadata);
 
-        if (metadata[ImageMetadata.WIDTH] != "")
-            item.width = metadata[ImageMetadata.WIDTH].to_int ();
+        if (metadata[PictureMetadata.WIDTH] != "")
+            item.width = metadata[PictureMetadata.WIDTH].to_int ();
 
-        if (metadata[ImageMetadata.HEIGHT] != "")
-            item.height = metadata[ImageMetadata.HEIGHT].to_int ();
+        if (metadata[PictureMetadata.HEIGHT] != "")
+            item.height = metadata[PictureMetadata.HEIGHT].to_int ();
 
         return item;
     }
@@ -60,13 +60,13 @@ public class Rygel.TrackerImageItemFactory : Rygel.TrackerItemFactory {
     public override string[] get_metadata_keys () {
         var base_keys = base.get_metadata_keys ();
 
-        var keys = new string[ImageMetadata.LAST_KEY];
+        var keys = new string[PictureMetadata.LAST_KEY];
         for (var i = 0; i < base_keys.length; i++) {
             keys[i] = base_keys[i];
         }
 
-        keys[ImageMetadata.WIDTH] = "nfo:width";
-        keys[ImageMetadata.HEIGHT] = "nfo:height";
+        keys[PictureMetadata.WIDTH] = "nfo:width";
+        keys[PictureMetadata.HEIGHT] = "nfo:height";
 
         return keys;
     }
diff --git a/src/plugins/tracker/rygel-tracker-root-container.vala b/src/plugins/tracker/rygel-tracker-root-container.vala
index dee8b0d..8db4b8e 100644
--- a/src/plugins/tracker/rygel-tracker-root-container.vala
+++ b/src/plugins/tracker/rygel-tracker-root-container.vala
@@ -37,7 +37,7 @@ public class Rygel.TrackerRootContainer : Rygel.SimpleContainer {
                                         "16",
                                         this,
                                         "Pictures",
-                                        new TrackerImageItemFactory ()));
+                                        new TrackerPictureItemFactory ()));
         this.add_child (new TrackerSearchContainer (
                                         "15",
                                         this,
diff --git a/src/plugins/tracker/rygel-tracker-tags.vala b/src/plugins/tracker/rygel-tracker-tags.vala
index ba813a0..d05103f 100644
--- a/src/plugins/tracker/rygel-tracker-tags.vala
+++ b/src/plugins/tracker/rygel-tracker-tags.vala
@@ -35,7 +35,7 @@ public class Rygel.TrackerTags : Rygel.TrackerMetadataValues {
 
     public TrackerTags (string         id,
                         MediaContainer parent) {
-        base (id, parent, TITLE, new TrackerImageItemFactory (), KEY_CHAIN);
+        base (id, parent, TITLE, new TrackerPictureItemFactory (), KEY_CHAIN);
     }
 }