[rygel-grilo] Rename to media-server2-server
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-grilo] Rename to media-server2-server
- Date: Tue, 13 Apr 2010 09:33:06 +0000 (UTC)
commit ed73a082c6736d62108d363087bbee75698ea244
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Fri Apr 9 09:57:41 2010 +0200
Rename to media-server2-server
As the library is intended to provide both server and client features, rename
the files and functions so later we can add the stuff regarding implementing
clients for content.
lib/Makefile.am | 12 ++--
lib/media-server2-private.h | 42 -----------
...-server2-glue.h => media-server2-server-glue.h} | 74 ++++++++++----------
lib/media-server2-server-private.h | 42 +++++++++++
lib/{media-server2.h => media-server2-server.h} | 0
lib/media-server2.c | 37 +++++-----
src/rygel-grilo.c | 2 +-
7 files changed, 104 insertions(+), 105 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ff44145..d615299 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,11 +7,11 @@
INCLUDES = @DEPS_CFLAGS@
-%-glue.h: $(top_srcdir)/data/%.xml
+%-server-glue.h: $(top_srcdir)/data/%.xml
$(DBUSBINDINGTOOL) \
--mode=glib-server \
--output=$@ \
- --prefix=$(subst -,_,$*) \
+ --prefix=$(subst -,_,$*)_server \
$^
lib_LTLIBRARIES = libmediaserver2.la
@@ -22,10 +22,10 @@ libmediaserver2_la_CFLAGS = \
libmediaserver2_la_LIBADD = \
$(DEPS_LIBS)
-libmediaserver2_la_SOURCES = \
- media-server2-glue.h \
- media-server2-private.h \
- media-server2.h \
+libmediaserver2_la_SOURCES = \
+ media-server2-server-glue.h \
+ media-server2-server-private.h \
+ media-server2-server.h \
media-server2.c
MAINTAINERCLEANFILES = \
diff --git a/lib/media-server2-glue.h b/lib/media-server2-server-glue.h
similarity index 71%
rename from lib/media-server2-glue.h
rename to lib/media-server2-server-glue.h
index 3eac7ef..7b6ba93 100644
--- a/lib/media-server2-glue.h
+++ b/lib/media-server2-server-glue.h
@@ -1,8 +1,8 @@
/* Generated by dbus-binding-tool; do not edit! */
-#ifndef __dbus_glib_marshal_media_server2_MARSHAL_H__
-#define __dbus_glib_marshal_media_server2_MARSHAL_H__
+#ifndef __dbus_glib_marshal_media_server2_server_MARSHAL_H__
+#define __dbus_glib_marshal_media_server2_server_MARSHAL_H__
#include <glib-object.h>
@@ -53,20 +53,20 @@ G_BEGIN_DECLS
#endif /* !G_ENABLE_DEBUG */
-/* NONE:STRING,UINT,INT,BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.JQKQAV:1) */
-extern void dbus_glib_marshal_media_server2_VOID__STRING_UINT_INT_BOXED_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+/* NONE:STRING,UINT,INT,BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZNEHAV:1) */
+extern void dbus_glib_marshal_media_server2_server_VOID__STRING_UINT_INT_BOXED_POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
void
-dbus_glib_marshal_media_server2_VOID__STRING_UINT_INT_BOXED_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
+dbus_glib_marshal_media_server2_server_VOID__STRING_UINT_INT_BOXED_POINTER (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_UINT_INT_BOXED_POINTER) (gpointer data1,
gpointer arg_1,
@@ -101,22 +101,22 @@ dbus_glib_marshal_media_server2_VOID__STRING_UINT_INT_BOXED_POINTER (GClosure
g_marshal_value_peek_pointer (param_values + 5),
data2);
}
-#define dbus_glib_marshal_media_server2_NONE__STRING_UINT_INT_BOXED_POINTER dbus_glib_marshal_media_server2_VOID__STRING_UINT_INT_BOXED_POINTER
-
-/* NONE:STRING,BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.JQKQAV:2) */
-extern void dbus_glib_marshal_media_server2_VOID__STRING_BOXED_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+#define dbus_glib_marshal_media_server2_server_NONE__STRING_UINT_INT_BOXED_POINTER dbus_glib_marshal_media_server2_server_VOID__STRING_UINT_INT_BOXED_POINTER
+
+/* NONE:STRING,BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.ZNEHAV:2) */
+extern void dbus_glib_marshal_media_server2_server_VOID__STRING_BOXED_POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
void
-dbus_glib_marshal_media_server2_VOID__STRING_BOXED_POINTER (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
+dbus_glib_marshal_media_server2_server_VOID__STRING_BOXED_POINTER (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_BOXED_POINTER) (gpointer data1,
gpointer arg_1,
@@ -147,21 +147,21 @@ dbus_glib_marshal_media_server2_VOID__STRING_BOXED_POINTER (GClosure *closur
g_marshal_value_peek_pointer (param_values + 3),
data2);
}
-#define dbus_glib_marshal_media_server2_NONE__STRING_BOXED_POINTER dbus_glib_marshal_media_server2_VOID__STRING_BOXED_POINTER
+#define dbus_glib_marshal_media_server2_server_NONE__STRING_BOXED_POINTER dbus_glib_marshal_media_server2_server_VOID__STRING_BOXED_POINTER
G_END_DECLS
-#endif /* __dbus_glib_marshal_media_server2_MARSHAL_H__ */
+#endif /* __dbus_glib_marshal_media_server2_server_MARSHAL_H__ */
#include <dbus/dbus-glib.h>
-static const DBusGMethodInfo dbus_glib_media_server2_methods[] = {
- { (GCallback) media_server2_get_children, dbus_glib_marshal_media_server2_NONE__STRING_UINT_INT_BOXED_POINTER, 0 },
- { (GCallback) media_server2_get_properties, dbus_glib_marshal_media_server2_NONE__STRING_BOXED_POINTER, 109 },
+static const DBusGMethodInfo dbus_glib_media_server2_server_methods[] = {
+ { (GCallback) media_server2_server_get_children, dbus_glib_marshal_media_server2_server_NONE__STRING_UINT_INT_BOXED_POINTER, 0 },
+ { (GCallback) media_server2_server_get_properties, dbus_glib_marshal_media_server2_server_NONE__STRING_BOXED_POINTER, 109 },
};
-const DBusGObjectInfo dbus_glib_media_server2_object_info = {
+const DBusGObjectInfo dbus_glib_media_server2_server_object_info = {
0,
- dbus_glib_media_server2_methods,
+ dbus_glib_media_server2_server_methods,
2,
"org.gnome.UPnP.MediaServer2\0GetChildren\0A\0id\0I\0s\0offset\0I\0u\0max_count\0I\0i\0filter\0I\0as\0children\0O\0F\0N\0a{sav}\0\0org.gnome.UPnP.MediaServer2\0GetProperties\0A\0id\0I\0s\0filter\0I\0as\0properties\0O\0F\0N\0av\0\0\0",
"\0",
diff --git a/lib/media-server2-server-private.h b/lib/media-server2-server-private.h
new file mode 100644
index 0000000..20760a4
--- /dev/null
+++ b/lib/media-server2-server-private.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Igalia S.L.
+ *
+ * Authors: Juan A. Suarez Romero <jasuarez igalia com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef _MEDIA_SERVER2_SERVER_PRIVATE_H_
+#define _MEDIA_SERVER2_SERVER_PRIVATE_H_
+
+#include "media-server2-server.h"
+
+gboolean media_server2_server_get_properties (MediaServer2 *server,
+ const gchar *id,
+ const gchar **filter,
+ DBusGMethodInvocation *context,
+ GError **error);
+
+gboolean media_server2_server_get_children (MediaServer2 *server,
+ const gchar *id,
+ guint offset,
+ gint max_count,
+ const gchar **filter,
+ DBusGMethodInvocation *context,
+ GError **error);
+
+#endif /* _MEDIA_SERVER2_SERVER_PRIVATE_H_ */
diff --git a/lib/media-server2.h b/lib/media-server2-server.h
similarity index 100%
rename from lib/media-server2.h
rename to lib/media-server2-server.h
diff --git a/lib/media-server2.c b/lib/media-server2.c
index 6c4060f..6a9421d 100644
--- a/lib/media-server2.c
+++ b/lib/media-server2.c
@@ -23,10 +23,9 @@
#include <dbus/dbus-glib-bindings.h>
#include <dbus/dbus-glib.h>
-#include "media-server2-private.h"
-#include "media-server2.h"
-
-#include "media-server2-glue.h"
+#include "media-server2-server-private.h"
+#include "media-server2-server-glue.h"
+#include "media-server2-server.h"
#define ENTRY_POINT_IFACE "/org/gnome/UPnP/MediaServer2"
#define ENTRY_POINT_NAME "org.gnome.UPnP.MediaServer2"
@@ -134,7 +133,7 @@ media_server2_class_init (MediaServer2Class *klass)
/* Register introspection */
dbus_g_object_type_install_info (MEDIA_SERVER2_TYPE,
- &dbus_glib_media_server2_object_info);
+ &dbus_glib_media_server2_server_object_info);
}
/* Object init function */
@@ -293,7 +292,7 @@ get_hash_children (GList *children,
}
/**
- * media_server2_get_properties:
+ * media_server2_server_get_properties:
* @server:
* @id:
* @filter:
@@ -305,11 +304,11 @@ get_hash_children (GList *children,
* Returns:
**/
gboolean
-media_server2_get_properties (MediaServer2 *server,
- const gchar *id,
- const gchar **filter,
- DBusGMethodInvocation *context,
- GError **error)
+media_server2_server_get_properties (MediaServer2 *server,
+ const gchar *id,
+ const gchar **filter,
+ DBusGMethodInvocation *context,
+ GError **error)
{
GError *prop_error = NULL;
GHashTable *properties = NULL;
@@ -350,7 +349,7 @@ media_server2_get_properties (MediaServer2 *server,
}
/**
- * media_server2_get_children:
+ * media_server2_server_get_children:
* @server:
* @id:
* @offset:
@@ -364,13 +363,13 @@ media_server2_get_properties (MediaServer2 *server,
* Returns:
**/
gboolean
-media_server2_get_children (MediaServer2 *server,
- const gchar *id,
- guint offset,
- gint max_count,
- const gchar **filter,
- DBusGMethodInvocation *context,
- GError **error)
+media_server2_server_get_children (MediaServer2 *server,
+ const gchar *id,
+ guint offset,
+ gint max_count,
+ const gchar **filter,
+ DBusGMethodInvocation *context,
+ GError **error)
{
GError *child_error = NULL;
diff --git a/src/rygel-grilo.c b/src/rygel-grilo.c
index 4234a92..3b28b7d 100644
--- a/src/rygel-grilo.c
+++ b/src/rygel-grilo.c
@@ -25,7 +25,7 @@
#include <grilo.h>
#include <stdio.h>
-#include "media-server2.h"
+#include "media-server2-server.h"
#define ID_PREFIX_AUDIO "gra://"
#define ID_PREFIX_CONTAINER "grc://"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
