[rygel-grilo] Refactor library: sort functions by visibility



commit c4e0a9e76c76a22b99649ec360dcbcaa003e0c89
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Thu Apr 15 14:27:44 2010 +0200

    Refactor library: sort functions by visibility

 lib/media-server2-client.c |  269 +++++++++++++++------------
 lib/media-server2-server.c |  443 ++++++++++---------------------------------
 2 files changed, 251 insertions(+), 461 deletions(-)
---
diff --git a/lib/media-server2-client.c b/lib/media-server2-client.c
index c1c6014..7a886db 100644
--- a/lib/media-server2-client.c
+++ b/lib/media-server2-client.c
@@ -38,14 +38,24 @@
   dbus_g_type_get_collection ("GPtrArray",      \
                               G_TYPE_VALUE)
 
-#define DBUS_TYPE_CHILDREN                              \
-  dbus_g_type_get_map ("GHashTable",                    \
-                       G_TYPE_STRING,                   \
-                       DBUS_TYPE_PROPERTIES)            \
+#define DBUS_TYPE_CHILDREN                      \
+  dbus_g_type_get_map ("GHashTable",            \
+                       G_TYPE_STRING,           \
+                       DBUS_TYPE_PROPERTIES)    \
 
-#define MS2_CLIENT_GET_PRIVATE(o)                                    \
+#define MS2_CLIENT_GET_PRIVATE(o)                                       \
   G_TYPE_INSTANCE_GET_PRIVATE((o), MS2_TYPE_CLIENT, MS2ClientPrivate)
 
+/*
+ * AsyncData: used to pack needed data when dealing with async functions
+ *   properties_result: when using get_properties_async() functions, it will
+ *                      store the properties table result
+ *   children_result: when using get_children_async() functions, it will store
+ *                    the list of children result
+ *   client: a reference to MS2Client
+ *   properties: list of properties requested
+ *   id: id of MediaObject to get properties/children from
+ */
 typedef struct {
   GHashTable *properties_result;
   GList *children_result;
@@ -54,12 +64,143 @@ typedef struct {
   gchar *id;
 } AsyncData;
 
+/*
+ * Private MS2Client structure
+ *   proxy_provider: a dbus proxy of content provider
+ */
 struct _MS2ClientPrivate {
   DBusGProxy *proxy_provider;
 };
 
 G_DEFINE_TYPE (MS2Client, ms2_client, G_TYPE_OBJECT);
 
+/******************** PRIVATE API ********************/
+
+/* Free gvalue */
+static void
+free_gvalue (GValue *v)
+{
+  g_value_unset (v);
+  g_free (v);
+}
+
+/* Free AsyncData struct */
+static void
+free_async_data (AsyncData *adata)
+{
+  g_object_unref (adata->client);
+  g_free (adata->id);
+  g_strfreev (adata->properties);
+  g_slice_free (AsyncData, adata);
+}
+
+/* Given a GPtrArray result (dbus answer of getting properties), returns a
+   ghashtable with pairs <keys, values> */
+static GHashTable *
+get_properties_table (const gchar *id,
+                      const gchar **properties,
+                      GPtrArray *result)
+{
+  GHashTable *table;
+  GValue *id_value;
+  gint i;
+
+  table = g_hash_table_new_full (g_str_hash,
+                                 g_str_equal,
+                                 (GDestroyNotify) g_free,
+                                 (GDestroyNotify) free_gvalue);
+
+  id_value = g_new0 (GValue, 1);
+  g_value_init (id_value, G_TYPE_STRING);
+  g_value_set_string (id_value, id);
+  g_hash_table_insert (table,
+                       g_strdup (MS2_PROP_ID),
+                       id_value);
+
+  for (i = 0; i < result->len; i++) {
+    g_hash_table_insert (table,
+                         g_strdup (properties[i]),
+                         g_boxed_copy (G_TYPE_VALUE,
+                                       g_ptr_array_index (result, i)));
+  }
+
+  return table;
+}
+
+/* Given a GHashTable result (dbus answer of getting children), returns a list
+   of children, which in turn are tables with pairs <keys, values>. Note that
+   child id is included in those pairs */
+static GList *
+get_children_list (GHashTable *result,
+                   const gchar **properties)
+{
+  GList *child_id;
+  GList *children = NULL;
+  GList *children_id;
+  GPtrArray *prop_array;
+
+  if (!result || g_hash_table_size (result) == 0) {
+    return NULL;
+  }
+
+  children_id = g_hash_table_get_keys (result);
+
+  for (child_id = children_id; child_id; child_id = g_list_next (child_id)) {
+    prop_array = g_hash_table_lookup (result, child_id->data);
+    children = g_list_prepend (children,
+                               get_properties_table (child_id->data,
+                                                     properties,
+                                                     prop_array));
+  }
+
+  g_list_free (children_id);
+
+  return children;
+}
+
+/* Callback invoked by dbus as answer to get_properties_async() */
+static void
+get_properties_async_reply (DBusGProxy *proxy,
+                            GPtrArray *result,
+                            GError *error,
+                            gpointer data)
+{
+  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (data);
+  AsyncData *adata;
+
+  adata = g_simple_async_result_get_op_res_gpointer (res);
+
+  adata->properties_result =
+    get_properties_table (adata->id,
+                          (const gchar **) adata->properties,
+                          result);
+  g_boxed_free (DBUS_TYPE_PROPERTIES, result);
+
+  g_simple_async_result_complete (res);
+  g_object_unref (res);
+}
+
+/* Callback invoked by dbus as answer to get_children_async() */
+static void
+get_children_async_reply (DBusGProxy *proxy,
+                          GHashTable *result,
+                          GError *error,
+                          gpointer data)
+{
+  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (data);
+  AsyncData *adata;
+
+  adata = g_simple_async_result_get_op_res_gpointer (res);
+
+  adata->children_result = get_children_list (result,
+                                              (const gchar **) adata->properties);
+
+  g_boxed_free (DBUS_TYPE_CHILDREN, result);
+
+  g_simple_async_result_complete (res);
+  g_object_unref (res);
+}
+
 /* Class init function */
 static void
 ms2_client_class_init (MS2ClientClass *klass)
@@ -73,6 +214,8 @@ ms2_client_init (MS2Client *client)
   client->priv = MS2_CLIENT_GET_PRIVATE (client);
 }
 
+/******************** PUBLIC API ********************/
+
 gchar **
 ms2_client_get_providers ()
 {
@@ -118,7 +261,6 @@ ms2_client_get_providers ()
     }
   }
 
-
   list_providers = g_new (gchar *, providers->len + 1);
   for (i = 0; i < providers->len; i++) {
     list_providers[i] = g_strdup (g_ptr_array_index (providers, i) + prefix_size);
@@ -174,72 +316,6 @@ MS2Client *ms2_client_new (const gchar *provider)
   return client;
 }
 
-static void
-free_gvalue (GValue *v)
-{
-  g_value_unset (v);
-  g_free (v);
-}
-
-static GHashTable *
-get_properties_table (const gchar *id,
-                      const gchar **properties,
-                      GPtrArray *result)
-{
-  GHashTable *table;
-  GValue *id_value;
-  gint i;
-
-  table = g_hash_table_new_full (g_str_hash,
-                                 g_str_equal,
-                                 (GDestroyNotify) g_free,
-                                 (GDestroyNotify) free_gvalue);
-
-  id_value = g_new0 (GValue, 1);
-  g_value_init (id_value, G_TYPE_STRING);
-  g_value_set_string (id_value, id);
-  g_hash_table_insert (table,
-                       g_strdup (MS2_PROP_ID),
-                       id_value);
-
-  for (i = 0; i < result->len; i++) {
-    g_hash_table_insert (table,
-                         g_strdup (properties[i]),
-                         g_boxed_copy (G_TYPE_VALUE,
-                                       g_ptr_array_index (result, i)));
-  }
-
-  return table;
-}
-
-static GList *
-get_children_list (GHashTable *result,
-                   const gchar **properties)
-{
-  GList *child_id;
-  GList *children = NULL;
-  GList *children_id;
-  GPtrArray *prop_array;
-
-  if (!result || g_hash_table_size (result) == 0) {
-    return NULL;
-  }
-
-  children_id = g_hash_table_get_keys (result);
-
-  for (child_id = children_id; child_id; child_id = g_list_next (child_id)) {
-    prop_array = g_hash_table_lookup (result, child_id->data);
-    children = g_list_prepend (children,
-                               get_properties_table (child_id->data,
-                                                     properties,
-                                                     prop_array));
-  }
-
-  g_list_free (children_id);
-
-  return children;
-}
-
 GHashTable *
 ms2_client_get_properties (MS2Client *client,
                            const gchar *id,
@@ -265,35 +341,6 @@ ms2_client_get_properties (MS2Client *client,
   return prop_result;
 }
 
-static void
-free_async_data (AsyncData *adata)
-{
-  g_object_unref (adata->client);
-  g_free (adata->id);
-  g_strfreev (adata->properties);
-  g_slice_free (AsyncData, adata);
-}
-
-static void
-get_properties_async_reply (DBusGProxy *proxy,
-                            GPtrArray *result,
-                            GError *error,
-                            gpointer data)
-{
-  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (data);
-  AsyncData *adata;
-
-  adata = g_simple_async_result_get_op_res_gpointer (res);
-
-  adata->properties_result = get_properties_table (adata->id,
-                                                   (const gchar **) adata->properties,
-                                                   result);
-  g_boxed_free (DBUS_TYPE_PROPERTIES, result);
-
-  g_simple_async_result_complete (res);
-  g_object_unref (res);
-}
-
 void ms2_client_get_properties_async (MS2Client *client,
                                       const gchar *id,
                                       const gchar **properties,
@@ -371,26 +418,6 @@ ms2_client_get_children (MS2Client *client,
   return children;
 }
 
-static void
-get_children_async_reply (DBusGProxy *proxy,
-                          GHashTable *result,
-                          GError *error,
-                          gpointer data)
-{
-  GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT (data);
-  AsyncData *adata;
-
-  adata = g_simple_async_result_get_op_res_gpointer (res);
-
-  adata->children_result = get_children_list (result,
-                                              (const gchar **) adata->properties);
-
-  g_boxed_free (DBUS_TYPE_CHILDREN, result);
-
-  g_simple_async_result_complete (res);
-  g_object_unref (res);
-}
-
 void ms2_client_get_children_async (MS2Client *client,
                                     const gchar *id,
                                     guint offset,
diff --git a/lib/media-server2-server.c b/lib/media-server2-server.c
index 43cde74..e73ad2c 100644
--- a/lib/media-server2-server.c
+++ b/lib/media-server2-server.c
@@ -34,7 +34,7 @@
 #define DBUS_TYPE_G_ARRAY_OF_STRING                             \
   (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING))
 
-#define MS2_SERVER_GET_PRIVATE(o)                                    \
+#define MS2_SERVER_GET_PRIVATE(o)                                       \
   G_TYPE_INSTANCE_GET_PRIVATE((o), MS2_TYPE_SERVER, MS2ServerPrivate)
 
 /*
@@ -51,71 +51,7 @@ struct _MS2ServerPrivate {
 
 G_DEFINE_TYPE (MS2Server, ms2_server, G_TYPE_OBJECT);
 
-/* Registers the MS2Server object in dbus */
-static gboolean
-ms2_server_dbus_register (MS2Server *server,
-                             const gchar *name)
-{
-  DBusGConnection *connection;
-  DBusGProxy *gproxy;
-  GError *error = NULL;
-  gchar *dbus_name;
-  gchar *dbus_path;
-  guint request_name_result;
-
-  connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-  if (!connection) {
-    g_printerr ("Could not connect to session bus, %s\n", error->message);
-    g_clear_error (&error);
-    return FALSE;
-  }
-
-  gproxy = dbus_g_proxy_new_for_name (connection,
-                                      DBUS_SERVICE_DBUS,
-                                      DBUS_PATH_DBUS,
-                                      DBUS_INTERFACE_DBUS);
-
-  /* Request name */
-  dbus_name = g_strconcat (MS2_DBUS_SERVICE_PREFIX, name, NULL);
-  if (!org_freedesktop_DBus_request_name (gproxy,
-                                          dbus_name,
-                                          DBUS_NAME_FLAG_DO_NOT_QUEUE,
-                                          &request_name_result,
-                                          NULL))  {
-    g_free (dbus_name);
-    return FALSE;
-  }
-  g_free (dbus_name);
-  g_object_unref (gproxy);
-
-  dbus_path = g_strconcat (MS2_DBUS_PATH_PREFIX, name, NULL);
-
-  /* Register object */
-  dbus_g_connection_register_g_object (connection,
-                                       dbus_path,
-                                       G_OBJECT (server));
-  g_free (dbus_path);
-
-  return TRUE;
-}
-
-/* Class init function */
-static void
-ms2_server_class_init (MS2ServerClass *klass)
-{
-  g_type_class_add_private (klass, sizeof (MS2ServerPrivate));
-
-  /* Register introspection */
-  dbus_g_object_type_install_info (MS2_TYPE_SERVER,
-                                   &dbus_glib_ms2_server_object_info);
-}
-
-/* Object init function */
-static void
-ms2_server_init (MS2Server *server)
-{
-  server->priv = MS2_SERVER_GET_PRIVATE (server);
-}
+/******************** PRIVATE API ********************/
 
 /* Free gvalue */
 static void
@@ -125,6 +61,7 @@ free_value (GValue *value)
   g_free (value);
 }
 
+/* Free a GPtrArray */
 static void
 free_ptr_array (GPtrArray *array)
 {
@@ -172,7 +109,7 @@ ptrarray_to_value (GPtrArray *array)
   return val;
 }
 
-/* Get unknown value for the property */
+/* Returns the unknown value for the property */
 static GValue *
 get_unknown_value (const gchar *property)
 {
@@ -233,7 +170,7 @@ get_array_properties (const gchar *id,
   return prop_array;
 }
 
-/* Return a hashtable with children and properties suitable to send as dbus
+/* Returns a hashtable with children and properties suitable to send as dbus
    reply */
 static GHashTable *
 get_hash_children (GList *children,
@@ -265,18 +202,74 @@ get_hash_children (GList *children,
   return children_hash;
 }
 
-/**
- * ms2_server_server_get_properties:
- * @server: 
- * @id: 
- * @filter: 
- * @context: 
- * @error: 
- *
- * 
- *
- * Returns: 
- **/
+/* Registers the MS2Server object in dbus */
+static gboolean
+ms2_server_dbus_register (MS2Server *server,
+                          const gchar *name)
+{
+  DBusGConnection *connection;
+  DBusGProxy *gproxy;
+  GError *error = NULL;
+  gchar *dbus_name;
+  gchar *dbus_path;
+  guint request_name_result;
+
+  connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+  if (!connection) {
+    g_printerr ("Could not connect to session bus, %s\n", error->message);
+    g_clear_error (&error);
+    return FALSE;
+  }
+
+  gproxy = dbus_g_proxy_new_for_name (connection,
+                                      DBUS_SERVICE_DBUS,
+                                      DBUS_PATH_DBUS,
+                                      DBUS_INTERFACE_DBUS);
+
+  /* Request name */
+  dbus_name = g_strconcat (MS2_DBUS_SERVICE_PREFIX, name, NULL);
+  if (!org_freedesktop_DBus_request_name (gproxy,
+                                          dbus_name,
+                                          DBUS_NAME_FLAG_DO_NOT_QUEUE,
+                                          &request_name_result,
+                                          NULL))  {
+    g_free (dbus_name);
+    return FALSE;
+  }
+  g_free (dbus_name);
+  g_object_unref (gproxy);
+
+  dbus_path = g_strconcat (MS2_DBUS_PATH_PREFIX, name, NULL);
+
+  /* Register object */
+  dbus_g_connection_register_g_object (connection,
+                                       dbus_path,
+                                       G_OBJECT (server));
+  g_free (dbus_path);
+
+  return TRUE;
+}
+
+/* Class init function */
+static void
+ms2_server_class_init (MS2ServerClass *klass)
+{
+  g_type_class_add_private (klass, sizeof (MS2ServerPrivate));
+
+  /* Register introspection */
+  dbus_g_object_type_install_info (MS2_TYPE_SERVER,
+                                   &dbus_glib_ms2_server_object_info);
+}
+
+/* Object init function */
+static void
+ms2_server_init (MS2Server *server)
+{
+  server->priv = MS2_SERVER_GET_PRIVATE (server);
+}
+
+/****************** INTERNAL PUBLIC API (NOT TO BE EXPORTED) ******************/
+
 gboolean
 ms2_server_get_properties (MS2Server *server,
                            const gchar *id,
@@ -322,20 +315,6 @@ ms2_server_get_properties (MS2Server *server,
   return TRUE;
 }
 
-/**
- * ms2_server_server_get_children:
- * @server: 
- * @id: 
- * @offset: 
- * @max_count: 
- * @filter: 
- * @context: 
- * @error: 
- *
- * 
- *
- * Returns: 
- **/
 gboolean
 ms2_server_get_children (MS2Server *server,
                          const gchar *id,
@@ -382,20 +361,13 @@ ms2_server_get_children (MS2Server *server,
   return TRUE;
 }
 
-/*********** PUBLIC API ***********/
+/********************* PUBLIC API *********************/
+
+/********** SERVER API **********/
 
-/**
- * ms2_server_new:
- * @name: 
- * @data: 
- *
- * 
- *
- * Returns: 
- **/
 MS2Server *
 ms2_server_new (const gchar *name,
-                   gpointer data)
+                gpointer data)
 {
   MS2Server *server;
 
@@ -411,46 +383,27 @@ ms2_server_new (const gchar *name,
   }
 }
 
-/**
- * ms2_server_set_get_properties_func:
- * @server: 
- * @f: 
- *
- * 
- **/
 void
 ms2_server_set_get_properties_func (MS2Server *server,
-                                       GetPropertiesFunc get_properties_func)
+                                    GetPropertiesFunc get_properties_func)
 {
   g_return_if_fail (MS2_IS_SERVER (server));
 
   server->priv->get_properties = get_properties_func;
 }
 
-/**
- * ms2_server_set_get_children_func:
- * @server: 
- * @f: 
- *
- * 
- **/
 void
 ms2_server_set_get_children_func (MS2Server *server,
-                                     GetChildrenFunc get_children_func)
+                                  GetChildrenFunc get_children_func)
 {
   g_return_if_fail (MS2_IS_SERVER (server));
 
   server->priv->get_children = get_children_func;
 }
 
-/**
- * ms2_server_new_properties_hashtable:
- * @id: 
- *
- * 
- *
- * Returns: 
- **/
+
+/********** PROPERTIES TABLE API **********/
+
 GHashTable *
 ms2_server_new_properties_hashtable (const gchar *id)
 {
@@ -467,16 +420,9 @@ ms2_server_new_properties_hashtable (const gchar *id)
   return properties;
 }
 
-/**
- * ms2_server_set_parent:
- * @properties: 
- * @parent: 
- *
- * 
- **/
 void
 ms2_server_set_parent (GHashTable *properties,
-                          const gchar *parent)
+                       const gchar *parent)
 {
   g_return_if_fail (properties);
 
@@ -487,16 +433,9 @@ ms2_server_set_parent (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_display_name:
- * @properties: 
- * @display_name: 
- *
- * 
- **/
 void
 ms2_server_set_display_name (GHashTable *properties,
-                                const gchar *display_name)
+                             const gchar *display_name)
 {
   g_return_if_fail (properties);
 
@@ -507,12 +446,6 @@ ms2_server_set_display_name (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_type_container:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_container (GHashTable *properties)
 {
@@ -523,12 +456,6 @@ ms2_server_set_type_container (GHashTable *properties)
                        str_to_value (MS2_TYPE_CONTAINER));
 }
 
-/**
- * ms2_server_set_type_video:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_video (GHashTable *properties)
 {
@@ -539,12 +466,6 @@ ms2_server_set_type_video (GHashTable *properties)
                        str_to_value (MS2_TYPE_VIDEO));
 }
 
-/**
- * ms2_server_set_type_movie:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_movie (GHashTable *properties)
 {
@@ -555,12 +476,6 @@ ms2_server_set_type_movie (GHashTable *properties)
                        str_to_value (MS2_TYPE_MOVIE));
 }
 
-/**
- * ms2_server_set_type_audio:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_audio (GHashTable *properties)
 {
@@ -571,12 +486,6 @@ ms2_server_set_type_audio (GHashTable *properties)
                        str_to_value (MS2_TYPE_AUDIO));
 }
 
-/**
- * ms2_server_set_type_music:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_music (GHashTable *properties)
 {
@@ -587,12 +496,6 @@ ms2_server_set_type_music (GHashTable *properties)
                        str_to_value (MS2_TYPE_MUSIC));
 }
 
-/**
- * ms2_server_set_type_image:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_image (GHashTable *properties)
 {
@@ -603,12 +506,6 @@ ms2_server_set_type_image (GHashTable *properties)
                        str_to_value (MS2_TYPE_IMAGE));
 }
 
-/**
- * ms2_server_set_type_photo:
- * @properties: 
- *
- * 
- **/
 void
 ms2_server_set_type_photo (GHashTable *properties)
 {
@@ -619,16 +516,9 @@ ms2_server_set_type_photo (GHashTable *properties)
                        str_to_value (MS2_TYPE_PHOTO));
 }
 
-/**
- * ms2_server_set_icon:
- * @properties: 
- * @icon: 
- *
- * 
- **/
 void
 ms2_server_set_icon (GHashTable *properties,
-                        const gchar *icon)
+                     const gchar *icon)
 {
   g_return_if_fail (properties);
 
@@ -639,16 +529,9 @@ ms2_server_set_icon (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_mime_type:
- * @properties: 
- * @mime_type: 
- *
- * 
- **/
 void
 ms2_server_set_mime_type (GHashTable *properties,
-                             const gchar *mime_type)
+                          const gchar *mime_type)
 {
   g_return_if_fail (properties);
 
@@ -659,16 +542,9 @@ ms2_server_set_mime_type (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_artist:
- * @properties: 
- * @artist: 
- *
- * 
- **/
 void
 ms2_server_set_artist (GHashTable *properties,
-                          const gchar *artist)
+                       const gchar *artist)
 {
   g_return_if_fail (properties);
 
@@ -679,16 +555,9 @@ ms2_server_set_artist (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_album:
- * @properties: 
- * @album: 
- *
- * 
- **/
 void
 ms2_server_set_album (GHashTable *properties,
-                         const gchar *album)
+                      const gchar *album)
 {
   g_return_if_fail (properties);
 
@@ -699,16 +568,9 @@ ms2_server_set_album (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_date:
- * @properties: 
- * @date: 
- *
- * 
- **/
 void
 ms2_server_set_date (GHashTable *properties,
-                        const gchar *date)
+                     const gchar *date)
 {
   g_return_if_fail (properties);
 
@@ -719,16 +581,9 @@ ms2_server_set_date (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_dlna_profile:
- * @properties: 
- * @dlna_profile: 
- *
- * 
- **/
 void
 ms2_server_set_dlna_profile (GHashTable *properties,
-                                const gchar *dlna_profile)
+                             const gchar *dlna_profile)
 {
   g_return_if_fail (properties);
 
@@ -739,16 +594,9 @@ ms2_server_set_dlna_profile (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_thumbnail:
- * @properties: 
- * @thumbnail: 
- *
- * 
- **/
 void
 ms2_server_set_thumbnail (GHashTable *properties,
-                             const gchar *thumbnail)
+                          const gchar *thumbnail)
 {
   g_return_if_fail (properties);
 
@@ -759,16 +607,9 @@ ms2_server_set_thumbnail (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_genre:
- * @properties: 
- * @genre: 
- *
- * 
- **/
 void
 ms2_server_set_genre (GHashTable *properties,
-                         const gchar *genre)
+                      const gchar *genre)
 {
   g_return_if_fail (properties);
 
@@ -779,16 +620,9 @@ ms2_server_set_genre (GHashTable *properties,
   }
 }
 
-/**
- * ms2_server_set_child_count:
- * @properties: 
- * @child_count: 
- *
- * 
- **/
 void
 ms2_server_set_child_count (GHashTable *properties,
-                               gint child_count)
+                            gint child_count)
 {
   g_return_if_fail (properties);
 
@@ -797,16 +631,9 @@ ms2_server_set_child_count (GHashTable *properties,
                        int_to_value (child_count));
 }
 
-/**
- * ms2_server_set_size:
- * @properties: 
- * @size: 
- *
- * 
- **/
 void
 ms2_server_set_size (GHashTable *properties,
-                        gint size)
+                     gint size)
 {
   g_return_if_fail (properties);
 
@@ -815,16 +642,9 @@ ms2_server_set_size (GHashTable *properties,
                        int_to_value (size));
 }
 
-/**
- * ms2_server_set_duration:
- * @properties: 
- * @duration: 
- *
- * 
- **/
 void
 ms2_server_set_duration (GHashTable *properties,
-                            gint duration)
+                         gint duration)
 {
   g_return_if_fail (properties);
 
@@ -833,16 +653,9 @@ ms2_server_set_duration (GHashTable *properties,
                        int_to_value (duration));
 }
 
-/**
- * ms2_server_set_bitrate:
- * @properties: 
- * @bitrate: 
- *
- * 
- **/
 void
 ms2_server_set_bitrate (GHashTable *properties,
-                           gint bitrate)
+                        gint bitrate)
 {
   g_return_if_fail (properties);
 
@@ -851,16 +664,9 @@ ms2_server_set_bitrate (GHashTable *properties,
                        int_to_value (bitrate));
 }
 
-/**
- * ms2_server_set_sample_rate:
- * @properties: 
- * @sample_rate: 
- *
- * 
- **/
 void
 ms2_server_set_sample_rate (GHashTable *properties,
-                               gint sample_rate)
+                            gint sample_rate)
 {
   g_return_if_fail (properties);
 
@@ -869,16 +675,9 @@ ms2_server_set_sample_rate (GHashTable *properties,
                        int_to_value (sample_rate));
 }
 
-/**
- * ms2_server_set_bits_per_sample:
- * @properties: 
- * @bits_per_sample: 
- *
- * 
- **/
 void
 ms2_server_set_bits_per_sample (GHashTable *properties,
-                                   gint bits_per_sample)
+                                gint bits_per_sample)
 {
   g_return_if_fail (properties);
 
@@ -887,16 +686,9 @@ ms2_server_set_bits_per_sample (GHashTable *properties,
                        int_to_value (bits_per_sample));
 }
 
-/**
- * ms2_server_set_width:
- * @properties: 
- * @width: 
- *
- * 
- **/
 void
 ms2_server_set_width (GHashTable *properties,
-                         gint width)
+                      gint width)
 {
   g_return_if_fail (properties);
 
@@ -905,16 +697,9 @@ ms2_server_set_width (GHashTable *properties,
                        int_to_value (width));
 }
 
-/**
- * ms2_server_set_height:
- * @properties: 
- * @height: 
- *
- * 
- **/
 void
 ms2_server_set_height (GHashTable *properties,
-                          gint height)
+                       gint height)
 {
   g_return_if_fail (properties);
 
@@ -923,16 +708,9 @@ ms2_server_set_height (GHashTable *properties,
                        int_to_value (height));
 }
 
-/**
- * ms2_server_set_pixel_width:
- * @properties: 
- * @pixel_width: 
- *
- * 
- **/
 void
 ms2_server_set_pixel_width (GHashTable *properties,
-                               gint pixel_width)
+                            gint pixel_width)
 {
   g_return_if_fail (properties);
 
@@ -941,16 +719,9 @@ ms2_server_set_pixel_width (GHashTable *properties,
                        int_to_value (pixel_width));
 }
 
-/**
- * ms2_server_set_pixel_height:
- * @properties: 
- * @pixel_height: 
- *
- * 
- **/
 void
 ms2_server_set_pixel_height (GHashTable *properties,
-                                gint pixel_height)
+                             gint pixel_height)
 {
   g_return_if_fail (properties);
 
@@ -959,16 +730,9 @@ ms2_server_set_pixel_height (GHashTable *properties,
                        int_to_value (pixel_height));
 }
 
-/**
- * ms2_server_set_urls:
- * @properties: 
- * @urls: 
- *
- * 
- **/
 void
 ms2_server_set_urls (GHashTable *properties,
-                        gchar **urls)
+                     gchar **urls)
 {
   GPtrArray *url_array;
   gint i;
@@ -986,4 +750,3 @@ ms2_server_set_urls (GHashTable *properties,
                          ptrarray_to_value (url_array));
   }
 }
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]