rygel r357 - in trunk/src: plugins/tracker rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Dec 16 14:31:34 2008
New Revision: 357
URL: http://svn.gnome.org/viewvc/rygel?rev=357&view=rev

Log:
Introduce an Error to serialize method.

Modified:
   trunk/src/plugins/tracker/rygel-tracker-container.vala
   trunk/src/plugins/tracker/rygel-tracker-image-item.vala
   trunk/src/plugins/tracker/rygel-tracker-music-item.vala
   trunk/src/plugins/tracker/rygel-tracker-video-item.vala
   trunk/src/rygel/rygel-media-container.vala
   trunk/src/rygel/rygel-media-item.vala
   trunk/src/rygel/rygel-media-object.vala

Modified: trunk/src/plugins/tracker/rygel-tracker-container.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-container.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-container.vala	Tue Dec 16 14:31:34 2008
@@ -88,7 +88,8 @@
         this.context = context;
     }
 
-    public override void serialize (DIDLLiteWriter didl_writer) {
+    public override void serialize (DIDLLiteWriter didl_writer)
+                                    throws GLib.Error {
         /* Update the child count */
         this.child_count = this.get_children_count ();
 
@@ -174,7 +175,15 @@
                                          this);
         }
 
-        item.serialize (didl_writer);
+        try {
+            item.serialize (didl_writer);
+        } catch (GLib.Error error) {
+            critical ("Failed to serialize item %s. Reason: %s",
+                      item.id,
+                      error.message);
+
+            return false;
+        }
 
         return true;
     }

Modified: trunk/src/plugins/tracker/rygel-tracker-image-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-image-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-image-item.vala	Tue Dec 16 14:31:34 2008
@@ -47,7 +47,8 @@
                              "DC:Date"};
     }
 
-    public override void serialize (DIDLLiteWriter didl_writer) {
+    public override void serialize (DIDLLiteWriter didl_writer)
+                                    throws GLib.Error {
         string[] values = null;
 
         /* TODO: make this async */

Modified: trunk/src/plugins/tracker/rygel-tracker-music-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-music-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-music-item.vala	Tue Dec 16 14:31:34 2008
@@ -47,7 +47,8 @@
                              "DC:Date"};
     }
 
-    public override void serialize (DIDLLiteWriter didl_writer) {
+    public override void serialize (DIDLLiteWriter didl_writer)
+                                    throws GLib.Error {
         string[] values = null;
 
         /* TODO: make this async */

Modified: trunk/src/plugins/tracker/rygel-tracker-video-item.vala
==============================================================================
--- trunk/src/plugins/tracker/rygel-tracker-video-item.vala	(original)
+++ trunk/src/plugins/tracker/rygel-tracker-video-item.vala	Tue Dec 16 14:31:34 2008
@@ -45,7 +45,8 @@
                              "DC:Date"};
     }
 
-    public override void serialize (DIDLLiteWriter didl_writer) {
+    public override void serialize (DIDLLiteWriter didl_writer)
+                                    throws GLib.Error {
         string[] values = null;
 
         /* TODO: make this async */

Modified: trunk/src/rygel/rygel-media-container.vala
==============================================================================
--- trunk/src/rygel/rygel-media-container.vala	(original)
+++ trunk/src/rygel/rygel-media-container.vala	Tue Dec 16 14:31:34 2008
@@ -46,7 +46,7 @@
         this ("0", "-1", title, child_count);
     }
 
-    public override void serialize (DIDLLiteWriter didl_writer) {
+    public override void serialize (DIDLLiteWriter didl_writer) throws Error {
         didl_writer.start_container (this.id,
                                      this.parent_id,
                                      (int) this.child_count,

Modified: trunk/src/rygel/rygel-media-item.vala
==============================================================================
--- trunk/src/rygel/rygel-media-item.vala	(original)
+++ trunk/src/rygel/rygel-media-item.vala	Tue Dec 16 14:31:34 2008
@@ -55,7 +55,7 @@
         this.upnp_class = upnp_class;
     }
 
-    public override void serialize (DIDLLiteWriter didl_writer) {
+    public override void serialize (DIDLLiteWriter didl_writer) throws Error {
         didl_writer.start_item (this.id,
                                 this.parent_id,
                                 null,

Modified: trunk/src/rygel/rygel-media-object.vala
==============================================================================
--- trunk/src/rygel/rygel-media-object.vala	(original)
+++ trunk/src/rygel/rygel-media-object.vala	Tue Dec 16 14:31:34 2008
@@ -33,5 +33,5 @@
     public string parent_id;
     public string title;
 
-    public abstract void serialize (DIDLLiteWriter didl_writer);
+    public abstract void serialize (DIDLLiteWriter didl_writer) throws Error;
 }