GNOME.org
 

[gupnp-dlna/wip/new-api] Expose GUPnPDLNANativeValueList.

commit 64089368fa3563af788374a0b5773fc5a840af43
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Wed Nov 28 12:25:51 2012 +0100

    Expose GUPnPDLNANativeValueList.

 libgupnp-dlna/Makefile.am                          |    9 ++-
 libgupnp-dlna/gupnp-dlna-restriction-private.h     |    2 +-
 libgupnp-dlna/gupnp-dlna-restriction.c             |    1 -
 libgupnp-dlna/gupnp-dlna-restriction.h             |    5 ++
 .../native/gupnp-dlna-native-sets.h                |    2 +-
 .../native/sets/gupnp-dlna-native-sets-private.h   |   15 +------
 .../sets/gupnp-dlna-native-value-list-private.h    |   49 ++++++++++++++++++++
 .../native/sets/gupnp-dlna-native-value-list.c     |    2 +-
 .../native/sets/gupnp-dlna-native-value-list.h     |   14 ++----
 libgupnp-dlna/profile-backends/native/sets/sets.am |    1 +
 tools/Makefile.am                                  |    3 +-
 11 files changed, 72 insertions(+), 31 deletions(-)
---
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 3e48bbb..0e94a7a 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -128,7 +128,8 @@ libgupnp_dlna_incdir = \
 libgupnp_dlna_inc_HEADERS = \
 	gupnp-dlna-profile-guesser.h \
 	gupnp-dlna-profile.h \
-	gupnp-dlna-restriction.h
+	gupnp-dlna-restriction.h \
+	profile-backends/native/sets/gupnp-dlna-native-value-list.h
 
 libgupnp_dlna_metadata_incdir = \
 	$(libgupnp_dlna_incdir)/metadata
@@ -153,7 +154,9 @@ dist_noinst_HEADERS += \
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS =
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
+INTROSPECTION_COMPILER_ARGS = \
+	--includedir=$(top_srcdir) \
+	--includedir=$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets
 
 if HAVE_INTROSPECTION
 
@@ -171,7 +174,7 @@ GUPnPDLNA_2_0_gir_SCANNERFLAGS = \
 	--warn-all \
 	--symbol-prefix=gupnp_dlna \
 	--identifier-prefix=GUPnPDLNA \
-	--add-include-path=$(top_srcdir)
+	-I$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets
 
 INTROSPECTION_GIRS += $(girs)
 
diff --git a/libgupnp-dlna/gupnp-dlna-restriction-private.h b/libgupnp-dlna/gupnp-dlna-restriction-private.h
index a26322f..43fde4a 100644
--- a/libgupnp-dlna/gupnp-dlna-restriction-private.h
+++ b/libgupnp-dlna/gupnp-dlna-restriction-private.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include "gupnp-dlna-restriction.h"
-#include "gupnp-dlna-native-value-list.h"
+#include "gupnp-dlna-native-value-list-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/libgupnp-dlna/gupnp-dlna-restriction.c b/libgupnp-dlna/gupnp-dlna-restriction.c
index 7742562..d2789e0 100644
--- a/libgupnp-dlna/gupnp-dlna-restriction.c
+++ b/libgupnp-dlna/gupnp-dlna-restriction.c
@@ -22,7 +22,6 @@
 #include <glib.h>
 
 #include "gupnp-dlna-restriction-private.h"
-#include "gupnp-dlna-native-value-list.h"
 #include "gupnp-dlna-native-sets-private.h"
 
 struct _GUPnPDLNARestriction {
diff --git a/libgupnp-dlna/gupnp-dlna-restriction.h b/libgupnp-dlna/gupnp-dlna-restriction.h
index 1fccb08..4e3e5c7 100644
--- a/libgupnp-dlna/gupnp-dlna-restriction.h
+++ b/libgupnp-dlna/gupnp-dlna-restriction.h
@@ -25,6 +25,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "gupnp-dlna-native-value-list.h"
+
 G_BEGIN_DECLS
 
 typedef struct _GUPnPDLNARestriction GUPnPDLNARestriction;
@@ -57,6 +59,9 @@ gupnp_dlna_restriction_to_string (GUPnPDLNARestriction *restriction);
 const gchar *
 gupnp_dlna_restriction_get_mime (GUPnPDLNARestriction *restriction);
 
+GHashTable *
+gupnp_dlna_restriction_get_entries (GUPnPDLNARestriction *restriction);
+
 G_END_DECLS
 
 #endif /* __GUPNP_DLNA_RESTRICTION_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/gupnp-dlna-native-sets.h b/libgupnp-dlna/profile-backends/native/gupnp-dlna-native-sets.h
index 79da341..2327132 100644
--- a/libgupnp-dlna/profile-backends/native/gupnp-dlna-native-sets.h
+++ b/libgupnp-dlna/profile-backends/native/gupnp-dlna-native-sets.h
@@ -23,7 +23,7 @@
 #define __GUPNP_DLNA_NATIVE_SETS_H__
 
 #include "gupnp-dlna-native-value-type.h"
-#include "gupnp-dlna-native-value-list.h"
+#include "gupnp-dlna-native-value-list-private.h"
 #include "gupnp-dlna-restriction-private.h"
 #include "gupnp-dlna-native-info-set.h"
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-sets-private.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-sets-private.h
index 4ef2838..1c7ee95 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-sets-private.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-sets-private.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include "gupnp-dlna-native-value-type.h"
-#include "gupnp-dlna-native-value-list.h"
+#include "gupnp-dlna-native-value-list-private.h"
 #include "gupnp-dlna-native-info-value.h"
 #include "gupnp-dlna-restriction-private.h"
 
@@ -90,24 +90,15 @@ gupnp_dlna_native_value_type_compare (GUPnPDLNANativeValueType  *type,
                                       GUPnPDLNANativeValueUnion *b);
 
 /* ValueList */
-GUPnPDLNANativeValueList *
-gupnp_dlna_native_value_list_copy (GUPnPDLNANativeValueList *list);
-
 gboolean
 gupnp_dlna_native_value_list_is_superset
                                         (GUPnPDLNANativeValueList *list,
                                          GUPnPDLNANativeInfoValue *value,
                                          gboolean                 *unsupported);
 
-gboolean
-gupnp_dlna_native_value_list_is_empty (GUPnPDLNANativeValueList *value_list);
-
 GList *
 gupnp_dlna_native_value_list_get_list (GUPnPDLNANativeValueList *value_list);
 
-gchar *
-gupnp_dlna_native_value_list_to_string (GUPnPDLNANativeValueList *value_list);
-
 void
 gupnp_dlna_native_value_list_sort_items (GUPnPDLNANativeValueList *value_list);
 
@@ -118,10 +109,6 @@ gupnp_dlna_native_info_value_get_type (GUPnPDLNANativeInfoValue *info);
 GUPnPDLNANativeValueUnion *
 gupnp_dlna_native_info_value_get_value (GUPnPDLNANativeInfoValue *info);
 
-/* Restriction */
-GHashTable *
-gupnp_dlna_restriction_get_entries (GUPnPDLNARestriction *restriction);
-
 G_END_DECLS
 
 #endif /* __GUPNP_DLNA_NATIVE_SETS_PRIVATE_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list-private.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list-private.h
new file mode 100644
index 0000000..3c13389
--- /dev/null
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list-private.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2012 Intel Corporation.
+ *
+ * Authors: Krzesimir Nowak <krnowak openismus 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; either
+ * version 2 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GUPNP_DLNA_NATIVE_VALUE_LIST_PRIVATE_H__
+#define __GUPNP_DLNA_NATIVE_VALUE_LIST_PRIVATE_H__
+
+#include <glib.h>
+
+#include "gupnp-dlna-native-value-list.h"
+#include "gupnp-dlna-native-value-type.h"
+
+G_BEGIN_DECLS
+
+GUPnPDLNANativeValueList *
+gupnp_dlna_native_value_list_new (GUPnPDLNANativeValueType *type);
+
+void
+gupnp_dlna_native_value_list_free (GUPnPDLNANativeValueList *list);
+
+gboolean
+gupnp_dlna_native_value_list_add_range (GUPnPDLNANativeValueList *list,
+                                        const gchar *min,
+                                        const gchar *max);
+
+gboolean
+gupnp_dlna_native_value_list_add_single (GUPnPDLNANativeValueList *list,
+                                         const gchar *single);
+
+G_END_DECLS
+
+#endif /* __GUPNP_DLNA_NATIVE_VALUE_LIST_PRIVATE_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.c
index 96a7297..6bcdbbf 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.c
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "gupnp-dlna-native-value-list.h"
+#include "gupnp-dlna-native-value-list-private.h"
 #include "gupnp-dlna-native-value.h"
 #include "gupnp-dlna-native-sets-private.h"
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.h
index 8922375..f1cc405 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-list.h
@@ -23,27 +23,23 @@
 #define __GUPNP_DLNA_NATIVE_VALUE_LIST_H__
 
 #include <glib.h>
-
-#include "gupnp-dlna-native-value-type.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
 typedef struct _GUPnPDLNANativeValueList GUPnPDLNANativeValueList;
 
 GUPnPDLNANativeValueList *
-gupnp_dlna_native_value_list_new (GUPnPDLNANativeValueType *type);
+gupnp_dlna_native_value_list_copy (GUPnPDLNANativeValueList *list);
 
 void
 gupnp_dlna_native_value_list_free (GUPnPDLNANativeValueList *list);
 
 gboolean
-gupnp_dlna_native_value_list_add_range (GUPnPDLNANativeValueList *list,
-                                        const gchar *min,
-                                        const gchar *max);
+gupnp_dlna_native_value_list_is_empty (GUPnPDLNANativeValueList *list);
 
-gboolean
-gupnp_dlna_native_value_list_add_single (GUPnPDLNANativeValueList *list,
-                                         const gchar *single);
+gchar *
+gupnp_dlna_native_value_list_to_string (GUPnPDLNANativeValueList *list);
 
 G_END_DECLS
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/sets.am b/libgupnp-dlna/profile-backends/native/sets/sets.am
index 50dcdcc..0df2b95 100644
--- a/libgupnp-dlna/profile-backends/native/sets/sets.am
+++ b/libgupnp-dlna/profile-backends/native/sets/sets.am
@@ -8,5 +8,6 @@ sets_sources = \
 	profile-backends/native/sets/gupnp-dlna-native-value.h \
 	profile-backends/native/sets/gupnp-dlna-native-value-list.c \
 	profile-backends/native/sets/gupnp-dlna-native-value-list.h \
+	profile-backends/native/sets/gupnp-dlna-native-value-list-private.h \
 	profile-backends/native/sets/gupnp-dlna-native-value-type.c \
 	profile-backends/native/sets/gupnp-dlna-native-value-type.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 959bee1..aa4c515 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,7 +7,8 @@ AM_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GOBJECT_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	$(GMODULE_CFLAGS)
+	$(GMODULE_CFLAGS) \
+	-I$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets
 LIBS = \
 	$(GLIB_LIBS) \
 	$(GOBJECT_LIBS) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]