GNOME.org
 

[gupnp-dlna/wip/new-api: 34/46] Remove native sets private header.

commit b0a667fc3f142863669bfd5005eaeae40ee514ac
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Fri Jan 4 12:45:36 2013 +0100

    Remove native sets private header.
    
    Most of native sets already is private implementation.

 libgupnp-dlna/gupnp-dlna-restriction-private.h     |    4 +-
 libgupnp-dlna/gupnp-dlna-restriction.c             |    4 +-
 libgupnp-dlna/gupnp-dlna-value-list-private.h      |   14 +++-
 libgupnp-dlna/gupnp-dlna-value-list.c              |   10 +-
 .../native/sets/gupnp-dlna-native-info-set.c       |    4 +-
 .../native/sets/gupnp-dlna-native-info-value.c     |    3 +-
 .../native/sets/gupnp-dlna-native-info-value.h     |   11 ++-
 .../native/sets/gupnp-dlna-native-sets-private.h   |  110 --------------------
 .../native/sets/gupnp-dlna-native-value-type.c     |    3 +-
 .../native/sets/gupnp-dlna-native-value-type.h     |   58 ++++++++++-
 .../native/sets/gupnp-dlna-native-value.c          |    2 +-
 .../native/sets/gupnp-dlna-native-value.h          |    3 +-
 libgupnp-dlna/profile-backends/native/sets/sets.am |    1 -
 tests/sets.c                                       |    3 +-
 14 files changed, 98 insertions(+), 132 deletions(-)
---
diff --git a/libgupnp-dlna/gupnp-dlna-restriction-private.h b/libgupnp-dlna/gupnp-dlna-restriction-private.h
index 7eeaef9..30886db 100644
--- a/libgupnp-dlna/gupnp-dlna-restriction-private.h
+++ b/libgupnp-dlna/gupnp-dlna-restriction-private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include "gupnp-dlna-restriction.h"
-#include "gupnp-dlna-value-list-private.h"
+#include "gupnp-dlna-value-list.h"
 
 G_BEGIN_DECLS
 
diff --git a/libgupnp-dlna/gupnp-dlna-restriction.c b/libgupnp-dlna/gupnp-dlna-restriction.c
index 22cc841..c31e150 100644
--- a/libgupnp-dlna/gupnp-dlna-restriction.c
+++ b/libgupnp-dlna/gupnp-dlna-restriction.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -22,7 +22,7 @@
 #include <glib.h>
 
 #include "gupnp-dlna-restriction-private.h"
-#include "gupnp-dlna-native-sets-private.h"
+#include "gupnp-dlna-value-list-private.h"
 
 struct _GUPnPDLNARestriction {
         gchar *mime;
diff --git a/libgupnp-dlna/gupnp-dlna-value-list-private.h b/libgupnp-dlna/gupnp-dlna-value-list-private.h
index 7533faf..9832d89 100644
--- a/libgupnp-dlna/gupnp-dlna-value-list-private.h
+++ b/libgupnp-dlna/gupnp-dlna-value-list-private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -24,6 +24,7 @@
 
 #include <glib.h>
 
+#include "gupnp-dlna-native-info-value.h"
 #include "gupnp-dlna-value-list.h"
 #include "gupnp-dlna-native-value-type.h"
 
@@ -44,6 +45,17 @@ gboolean
 gupnp_dlna_value_list_add_single (GUPnPDLNAValueList *list,
                                   const gchar        *single);
 
+gboolean
+gupnp_dlna_value_list_is_superset (GUPnPDLNAValueList       *list,
+                                   GUPnPDLNANativeInfoValue *value,
+                                   gboolean                 *unsupported);
+
+GList *
+gupnp_dlna_value_list_get_list (GUPnPDLNAValueList *value_list);
+
+void
+gupnp_dlna_value_list_sort_items (GUPnPDLNAValueList *value_list);
+
 G_END_DECLS
 
 #endif /* __GUPNP_DLNA_VALUE_LIST_PRIVATE_H__ */
diff --git a/libgupnp-dlna/gupnp-dlna-value-list.c b/libgupnp-dlna/gupnp-dlna-value-list.c
index b13a2b2..0482f69 100644
--- a/libgupnp-dlna/gupnp-dlna-value-list.c
+++ b/libgupnp-dlna/gupnp-dlna-value-list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -21,7 +21,7 @@
 
 #include "gupnp-dlna-value-list-private.h"
 #include "gupnp-dlna-native-value.h"
-#include "gupnp-dlna-native-sets-private.h"
+#include "gupnp-dlna-native-info-value.h"
 
 struct _GUPnPDLNAValueList {
         GUPnPDLNANativeValueType *type;
@@ -172,9 +172,9 @@ gupnp_dlna_value_list_copy (GUPnPDLNAValueList *list)
 }
 
 gboolean
-gupnp_dlna_value_list_is_superset (GUPnPDLNAValueList *list,
-                                          GUPnPDLNANativeInfoValue *value,
-                                          gboolean                 *unsupported)
+gupnp_dlna_value_list_is_superset (GUPnPDLNAValueList       *list,
+                                   GUPnPDLNANativeInfoValue *value,
+                                   gboolean                 *unsupported)
 {
         GList *iter;
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-set.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-set.c
index b24eb05..a3ff567 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-set.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -23,7 +23,7 @@
 
 #include "gupnp-dlna-native-info-set.h"
 #include "gupnp-dlna-native-info-value.h"
-#include "gupnp-dlna-native-sets-private.h"
+#include "gupnp-dlna-value-list-private.h"
 
 struct _GUPnPDLNANativeInfoSet {
         gchar *mime;
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
index 70b17db..4a2037b 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
@@ -20,9 +20,8 @@
  */
 
 #include <string.h> /* for memset */
+
 #include "gupnp-dlna-native-info-value.h"
-#include "gupnp-dlna-native-value-type.h"
-#include "gupnp-dlna-native-sets-private.h"
 
 /* private */
 struct _GUPnPDLNANativeInfoValue {
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h
index 68b897a..a07fb7a 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -24,6 +24,9 @@
 
 #include <glib.h>
 
+#include "gupnp-dlna-native-value-type.h"
+#include "gupnp-dlna-value-union.h"
+
 G_BEGIN_DECLS
 
 typedef struct _GUPnPDLNANativeInfoValue GUPnPDLNANativeInfoValue;
@@ -62,6 +65,12 @@ gupnp_dlna_native_info_value_to_string (GUPnPDLNANativeInfoValue *info_value);
 gboolean
 gupnp_dlna_native_info_value_is_unsupported (GUPnPDLNANativeInfoValue *info);
 
+GUPnPDLNANativeValueType *
+gupnp_dlna_native_info_value_get_type (GUPnPDLNANativeInfoValue *info);
+
+GUPnPDLNAValueUnion *
+gupnp_dlna_native_info_value_get_value (GUPnPDLNANativeInfoValue *info);
+
 G_END_DECLS
 
 #endif /* __GUPNP_DLNA_NATIVE_INFO_VALUE_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.c
index 8030521..e1e9601 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.c
@@ -20,8 +20,9 @@
  */
 
 #include <stdlib.h>
+
+#include "gupnp-dlna-g-values-private.h"
 #include "gupnp-dlna-native-value-type.h"
-#include "gupnp-dlna-native-sets-private.h"
 
 struct _GUPnPDLNANativeValueType {
         gboolean
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h
index 23de547..3bef5cb 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value-type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -23,6 +23,9 @@
 #define __GUPNP_DLNA_NATIVE_VALUE_TYPE_H__
 
 #include <glib.h>
+#include <glib-object.h>
+
+#include "gupnp-dlna-value-union.h"
 
 G_BEGIN_DECLS
 
@@ -40,6 +43,59 @@ gupnp_dlna_native_value_type_int (void);
 GUPnPDLNANativeValueType *
 gupnp_dlna_native_value_type_string (void);
 
+gboolean
+gupnp_dlna_native_value_type_init (GUPnPDLNANativeValueType  *type,
+                                   GUPnPDLNAValueUnion *value,
+                                   const gchar               *raw);
+
+gboolean
+gupnp_dlna_native_value_type_copy (GUPnPDLNANativeValueType  *type,
+                                   GUPnPDLNAValueUnion *from,
+                                   GUPnPDLNAValueUnion *to);
+
+void
+gupnp_dlna_native_value_type_clean (GUPnPDLNANativeValueType  *type,
+                                    GUPnPDLNAValueUnion *value_union);
+
+gboolean
+gupnp_dlna_native_value_type_is_equal (GUPnPDLNANativeValueType  *type,
+                                       GUPnPDLNAValueUnion *first,
+                                       GUPnPDLNAValueUnion *second);
+
+gboolean
+gupnp_dlna_native_value_type_is_in_range (GUPnPDLNANativeValueType  *type,
+                                          GUPnPDLNAValueUnion *min,
+                                          GUPnPDLNAValueUnion *max,
+                                          GUPnPDLNAValueUnion *value);
+
+const gchar *
+gupnp_dlna_native_value_type_name (GUPnPDLNANativeValueType *type);
+
+gboolean
+gupnp_dlna_native_value_type_verify_range (GUPnPDLNANativeValueType  *type,
+                                           GUPnPDLNAValueUnion *min,
+                                           GUPnPDLNAValueUnion *max);
+
+gchar *
+gupnp_dlna_native_value_type_to_string (GUPnPDLNANativeValueType  *type,
+                                        GUPnPDLNAValueUnion *value);
+
+gint
+gupnp_dlna_native_value_type_compare (GUPnPDLNANativeValueType  *type,
+                                      GUPnPDLNAValueUnion *a,
+                                      GUPnPDLNAValueUnion *b);
+
+void
+gupnp_dlna_native_value_type_to_g_value (GUPnPDLNANativeValueType  *type,
+                                         GUPnPDLNAValueUnion *value,
+                                         GValue                    *g_value);
+
+gboolean
+gupnp_dlna_native_value_type_flatten (GUPnPDLNANativeValueType *type,
+                                      GValue *target,
+                                      GValue *from,
+                                      GValue *to);
+
 G_END_DECLS
 
 #endif /* __GUPNP_DLNA_NATIVE_VALUE_TYPE_H__ */
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c
index d9ea3ea..96cff18 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.c
@@ -20,7 +20,7 @@
  */
 
 #include "gupnp-dlna-native-value.h"
-#include "gupnp-dlna-native-sets-private.h"
+#include "gupnp-dlna-value-union.h"
 
 struct _GUPnPDLNANativeValueVTable {
         gboolean
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h
index 7059e63..d049508 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h
+++ b/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-value.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -24,6 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
+
 #include "gupnp-dlna-native-info-value.h"
 #include "gupnp-dlna-native-value-type.h"
 
diff --git a/libgupnp-dlna/profile-backends/native/sets/sets.am b/libgupnp-dlna/profile-backends/native/sets/sets.am
index da341df..33229c5 100644
--- a/libgupnp-dlna/profile-backends/native/sets/sets.am
+++ b/libgupnp-dlna/profile-backends/native/sets/sets.am
@@ -3,7 +3,6 @@ sets_sources = \
 	profile-backends/native/sets/gupnp-dlna-native-info-set.h \
 	profile-backends/native/sets/gupnp-dlna-native-info-value.c \
 	profile-backends/native/sets/gupnp-dlna-native-info-value.h \
-	profile-backends/native/sets/gupnp-dlna-native-sets-private.h \
 	profile-backends/native/sets/gupnp-dlna-native-value.c \
 	profile-backends/native/sets/gupnp-dlna-native-value.h \
 	profile-backends/native/sets/gupnp-dlna-native-value-type.c \
diff --git a/tests/sets.c b/tests/sets.c
index f638255..d6953d9 100644
--- a/tests/sets.c
+++ b/tests/sets.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Authors: Krzesimir Nowak <krnowak openismus com>
  *
@@ -21,7 +21,6 @@
 
 #include <glib.h>
 #include "gupnp-dlna-native-sets.h"
-#include "gupnp-dlna-native-sets-private.h"
 
 static void
 value_type_not_null (void)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]