[gupnp-dlna/wip/new-api: 34/48] Move info value to main source directory.
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp-dlna/wip/new-api: 34/48] Move info value to main source directory.
- Date: Wed, 16 Jan 2013 10:43:31 +0000 (UTC)
commit 459c0da0b03d03445cf6195a84b4978d130bc647
Author: Krzesimir Nowak <krnowak openismus com>
Date: Thu Jan 3 14:36:41 2013 +0100
Move info value to main source directory.
libgupnp-dlna/Makefile.am | 6 +-
...native-info-value.c => gupnp-dlna-info-value.c} | 94 +++++++++----------
libgupnp-dlna/gupnp-dlna-info-value.h | 76 ++++++++++++++++
libgupnp-dlna/gupnp-dlna-value-list-private.h | 8 +-
libgupnp-dlna/gupnp-dlna-value-list.c | 16 ++--
.../native/sets/gupnp-dlna-native-info-set.c | 30 +++---
.../native/sets/gupnp-dlna-native-info-value.h | 76 ----------------
.../native/sets/gupnp-dlna-native-value.c | 20 ++--
.../native/sets/gupnp-dlna-native-value.h | 4 +-
libgupnp-dlna/profile-backends/native/sets/sets.am | 2 -
10 files changed, 164 insertions(+), 168 deletions(-)
---
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 3331d74..a668f44 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -121,7 +121,8 @@ libgupnp_dlna_2_0_la_SOURCES = \
gupnp-dlna-value-list.c \
gupnp-dlna-g-values.c \
gupnp-dlna-utils.c \
- gupnp-dlna-value-type.c
+ gupnp-dlna-value-type.c \
+ gupnp-dlna-info-value.c
libgupnp_dlna_2_0_la_LIBADD = \
$(gupnp_libadd) \
libloader.la \
@@ -162,7 +163,8 @@ dist_noinst_HEADERS += \
gupnp-dlna-g-values-private.h \
gupnp-dlna-utils.h \
gupnp-dlna-value-union.h \
- gupnp-dlna-value-type.h
+ gupnp-dlna-value-type.h \
+ gupnp-dlna-info-value.h
# INTROSPECTION
diff --git a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c b/libgupnp-dlna/gupnp-dlna-info-value.c
similarity index 53%
rename from libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
rename to libgupnp-dlna/gupnp-dlna-info-value.c
index bf87ccf..10cc487 100644
--- a/libgupnp-dlna/profile-backends/native/sets/gupnp-dlna-native-info-value.c
+++ b/libgupnp-dlna/gupnp-dlna-info-value.c
@@ -21,27 +21,24 @@
#include <string.h> /* for memset */
-#include "gupnp-dlna-native-info-value.h"
+#include "gupnp-dlna-info-value.h"
/* private */
-struct _GUPnPDLNANativeInfoValue {
+struct _GUPnPDLNAInfoValue {
GUPnPDLNAValueType *type;
GUPnPDLNAValueUnion value;
- gboolean unsupported;
+ gboolean unsupported;
};
-static GUPnPDLNANativeInfoValue *
+static GUPnPDLNAInfoValue *
value_new (GUPnPDLNAValueType *type,
gchar *raw)
{
- GUPnPDLNANativeInfoValue *info_value =
- g_slice_new (GUPnPDLNANativeInfoValue);
+ GUPnPDLNAInfoValue *info_value = g_slice_new (GUPnPDLNAInfoValue);
info_value->type = type;
- if (!gupnp_dlna_value_type_init (type,
- &info_value->value,
- raw)) {
- g_slice_free (GUPnPDLNANativeInfoValue, info_value);
+ if (!gupnp_dlna_value_type_init (type, &info_value->value, raw)) {
+ g_slice_free (GUPnPDLNAInfoValue, info_value);
info_value = NULL;
}
else
@@ -51,11 +48,10 @@ value_new (GUPnPDLNAValueType *type,
return info_value;
}
-static GUPnPDLNANativeInfoValue *
+static GUPnPDLNAInfoValue *
value_unsupported (GUPnPDLNAValueType *type)
{
- GUPnPDLNANativeInfoValue *info_value =
- g_slice_new (GUPnPDLNANativeInfoValue);
+ GUPnPDLNAInfoValue *info_value = g_slice_new (GUPnPDLNAInfoValue);
info_value->type = type;
memset (&info_value->value, 0, sizeof (GUPnPDLNAValueUnion));
@@ -64,22 +60,22 @@ value_unsupported (GUPnPDLNAValueType *type)
return info_value;
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_bool (gboolean value)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_bool (gboolean value)
{
return value_new (gupnp_dlna_value_type_bool (),
g_strdup (value ? "true" : "false"));
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_unsupported_bool (void)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_bool (void)
{
return value_unsupported (gupnp_dlna_value_type_bool ());
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_fraction (gint numerator,
- gint denominator)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_fraction (gint numerator,
+ gint denominator)
{
return value_new (gupnp_dlna_value_type_fraction (),
g_strdup_printf ("%d/%d",
@@ -87,84 +83,84 @@ gupnp_dlna_native_info_value_new_fraction (gint numerator,
denominator));
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_unsupported_fraction (void)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_fraction (void)
{
return value_unsupported (gupnp_dlna_value_type_fraction ());
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_int (gint value)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_int (gint value)
{
return value_new (gupnp_dlna_value_type_int (),
g_strdup_printf ("%d", value));
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_unsupported_int (void)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_int (void)
{
return value_unsupported (gupnp_dlna_value_type_int ());
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_string (const gchar *value)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_string (const gchar *value)
{
return value_new (gupnp_dlna_value_type_string (),
g_strdup (value));
}
-GUPnPDLNANativeInfoValue *
-gupnp_dlna_native_info_value_new_unsupported_string (void)
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_string (void)
{
return value_unsupported (gupnp_dlna_value_type_string ());
}
void
-gupnp_dlna_native_info_value_free (GUPnPDLNANativeInfoValue *info_value)
+gupnp_dlna_info_value_free (GUPnPDLNAInfoValue *info_value)
{
if (info_value == NULL)
return;
if (!info_value->unsupported)
gupnp_dlna_value_type_clean (info_value->type,
- &info_value->value);
- g_slice_free (GUPnPDLNANativeInfoValue, info_value);
+ &info_value->value);
+ g_slice_free (GUPnPDLNAInfoValue, info_value);
}
GUPnPDLNAValueType *
-gupnp_dlna_native_info_value_get_type (GUPnPDLNANativeInfoValue *info)
+gupnp_dlna_info_value_get_type (GUPnPDLNAInfoValue *info_value)
{
- g_return_val_if_fail (info != NULL, NULL);
+ g_return_val_if_fail (info_value != NULL, NULL);
- return info->type;
+ return info_value->type;
}
GUPnPDLNAValueUnion *
-gupnp_dlna_native_info_value_get_value (GUPnPDLNANativeInfoValue *info)
+gupnp_dlna_info_value_get_value (GUPnPDLNAInfoValue *info_value)
{
- g_return_val_if_fail (info != NULL, NULL);
+ g_return_val_if_fail (info_value != NULL, NULL);
- if (info->unsupported)
+ if (info_value->unsupported)
return NULL;
else
- return &info->value;
+ return &info_value->value;
}
gchar *
-gupnp_dlna_native_info_value_to_string (GUPnPDLNANativeInfoValue *info)
+gupnp_dlna_info_value_to_string (GUPnPDLNAInfoValue *info_value)
{
const gchar *type;
gchar *raw;
gchar *str;
- g_return_val_if_fail (info != NULL, NULL);
+ g_return_val_if_fail (info_value != NULL, NULL);
- type = gupnp_dlna_value_type_name (info->type);
- if (info->unsupported)
+ type = gupnp_dlna_value_type_name (info_value->type);
+ if (info_value->unsupported)
raw = g_strdup ("<UNSUPPORTED>");
else
- raw = gupnp_dlna_value_type_to_string (info->type,
- &info->value);
+ raw = gupnp_dlna_value_type_to_string (info_value->type,
+ &info_value->value);
str = g_strdup_printf ("(%s)%s", type, raw);
g_free (raw);
@@ -172,9 +168,9 @@ gupnp_dlna_native_info_value_to_string (GUPnPDLNANativeInfoValue *info)
}
gboolean
-gupnp_dlna_native_info_value_is_unsupported (GUPnPDLNANativeInfoValue *info)
+gupnp_dlna_info_value_is_unsupported (GUPnPDLNAInfoValue *info_value)
{
- g_return_val_if_fail (info != NULL, FALSE);
+ g_return_val_if_fail (info_value != NULL, FALSE);
- return info->unsupported;
+ return info_value->unsupported;
}
diff --git a/libgupnp-dlna/gupnp-dlna-info-value.h b/libgupnp-dlna/gupnp-dlna-info-value.h
new file mode 100644
index 0000000..e230e4d
--- /dev/null
+++ b/libgupnp-dlna/gupnp-dlna-info-value.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2012, 2013 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_INFO_VALUE_H__
+#define __GUPNP_DLNA_INFO_VALUE_H__
+
+#include <glib.h>
+
+#include "gupnp-dlna-value-type.h"
+#include "gupnp-dlna-value-union.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GUPnPDLNAInfoValue GUPnPDLNAInfoValue;
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_bool (gboolean value);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_bool (void);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_fraction (gint numerator,
+ gint denominator);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_fraction (void);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_int (gint value);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_int (void);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_string (const gchar *value);
+
+GUPnPDLNAInfoValue *
+gupnp_dlna_info_value_new_unsupported_string (void);
+
+void
+gupnp_dlna_info_value_free (GUPnPDLNAInfoValue *info_value);
+
+gchar *
+gupnp_dlna_info_value_to_string (GUPnPDLNAInfoValue *info_value);
+
+gboolean
+gupnp_dlna_info_value_is_unsupported (GUPnPDLNAInfoValue *info_value);
+
+GUPnPDLNAValueType *
+gupnp_dlna_info_value_get_type (GUPnPDLNAInfoValue *info_value);
+
+GUPnPDLNAValueUnion *
+gupnp_dlna_info_value_get_value (GUPnPDLNAInfoValue *info_value);
+
+G_END_DECLS
+
+#endif /* __GUPNP_DLNA_INFO_VALUE_H__ */
diff --git a/libgupnp-dlna/gupnp-dlna-value-list-private.h b/libgupnp-dlna/gupnp-dlna-value-list-private.h
index bfc3ee1..cd268aa 100644
--- a/libgupnp-dlna/gupnp-dlna-value-list-private.h
+++ b/libgupnp-dlna/gupnp-dlna-value-list-private.h
@@ -24,7 +24,7 @@
#include <glib.h>
-#include "gupnp-dlna-native-info-value.h"
+#include "gupnp-dlna-info-value.h"
#include "gupnp-dlna-value-list.h"
#include "gupnp-dlna-value-type.h"
@@ -46,9 +46,9 @@ gupnp_dlna_value_list_add_single (GUPnPDLNAValueList *list,
const gchar *single);
gboolean
-gupnp_dlna_value_list_is_superset (GUPnPDLNAValueList *list,
- GUPnPDLNANativeInfoValue *value,
- gboolean *unsupported);
+gupnp_dlna_value_list_is_superset (GUPnPDLNAValueList *list,
+ GUPnPDLNAInfoValue *value,
+ gboolean *unsupported);
GList *
gupnp_dlna_value_list_get_list (GUPnPDLNAValueList *value_list);
diff --git a/libgupnp-dlna/gupnp-dlna-value-list.c b/libgupnp-dlna/gupnp-dlna-value-list.c
index b9791d0..c208eed 100644
--- a/libgupnp-dlna/gupnp-dlna-value-list.c
+++ b/libgupnp-dlna/gupnp-dlna-value-list.c
@@ -21,12 +21,12 @@
#include "gupnp-dlna-value-list-private.h"
#include "gupnp-dlna-native-value.h"
-#include "gupnp-dlna-native-info-value.h"
+#include "gupnp-dlna-info-value.h"
struct _GUPnPDLNAValueList {
GUPnPDLNAValueType *type;
- GList *values; /* <GUPnPDLNANativeValue *> */
- gboolean sorted;
+ GList *values; /* <GUPnPDLNANativeValue *> */
+ gboolean sorted;
};
G_DEFINE_BOXED_TYPE (GUPnPDLNAValueList,
@@ -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,
+ GUPnPDLNAInfoValue *value,
+ gboolean *unsupported)
{
GList *iter;
@@ -182,10 +182,10 @@ gupnp_dlna_value_list_is_superset (GUPnPDLNAValueList *list,
g_return_val_if_fail (value != NULL, FALSE);
g_return_val_if_fail (unsupported != NULL, FALSE);
- if (list->type != gupnp_dlna_native_info_value_get_type (value))
+ if (list->type != gupnp_dlna_info_value_get_type (value))
return FALSE;
- if (gupnp_dlna_native_info_value_is_unsupported (value)) {
+ if (gupnp_dlna_info_value_is_unsupported (value)) {
*unsupported = TRUE;
return TRUE;
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 a3ff567..cbca254 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
@@ -22,12 +22,12 @@
#include <glib.h>
#include "gupnp-dlna-native-info-set.h"
-#include "gupnp-dlna-native-info-value.h"
+#include "gupnp-dlna-info-value.h"
#include "gupnp-dlna-value-list-private.h"
struct _GUPnPDLNANativeInfoSet {
gchar *mime;
- GHashTable *entries; /* <gchar *, GUPnPDLNANativeInfoValue *> */
+ GHashTable *entries; /* <gchar *, GUPnPDLNAInfoValue *> */
};
GUPnPDLNANativeInfoSet *
@@ -43,7 +43,7 @@ gupnp_dlna_native_info_set_new (const gchar *mime)
(g_str_hash,
g_str_equal,
g_free,
- (GDestroyNotify) gupnp_dlna_native_info_value_free);
+ (GDestroyNotify) gupnp_dlna_info_value_free);
return info_set;
}
@@ -61,7 +61,7 @@ gupnp_dlna_native_info_set_free (GUPnPDLNANativeInfoSet *info_set)
static gboolean
insert_value (GUPnPDLNANativeInfoSet *info_set,
const gchar *name,
- GUPnPDLNANativeInfoValue *value)
+ GUPnPDLNAInfoValue *value)
{
if (value == NULL) {
g_debug ("Info set: value '%s' is NULL.", name);
@@ -71,7 +71,7 @@ insert_value (GUPnPDLNANativeInfoSet *info_set,
if (g_hash_table_contains (info_set->entries, name)) {
g_debug ("Info set: value '%s' already exists.", name);
- gupnp_dlna_native_info_value_free (value);
+ gupnp_dlna_info_value_free (value);
return FALSE;
}
@@ -90,7 +90,7 @@ gupnp_dlna_native_info_set_add_bool (GUPnPDLNANativeInfoSet *info_set,
return insert_value (info_set,
name,
- gupnp_dlna_native_info_value_new_bool (value));
+ gupnp_dlna_info_value_new_bool (value));
}
gboolean
@@ -104,7 +104,7 @@ gupnp_dlna_native_info_set_add_unsupported_bool
return insert_value
(info_set,
name,
- gupnp_dlna_native_info_value_new_unsupported_bool ());
+ gupnp_dlna_info_value_new_unsupported_bool ());
}
gboolean
@@ -118,7 +118,7 @@ gupnp_dlna_native_info_set_add_fraction (GUPnPDLNANativeInfoSet *info_set,
return insert_value (info_set,
name,
- gupnp_dlna_native_info_value_new_fraction
+ gupnp_dlna_info_value_new_fraction
(numerator,
denominator));
}
@@ -134,7 +134,7 @@ gupnp_dlna_native_info_set_add_unsupported_fraction
return insert_value
(info_set,
name,
- gupnp_dlna_native_info_value_new_unsupported_fraction ());
+ gupnp_dlna_info_value_new_unsupported_fraction ());
}
gboolean
@@ -147,7 +147,7 @@ gupnp_dlna_native_info_set_add_int (GUPnPDLNANativeInfoSet *info_set,
return insert_value (info_set,
name,
- gupnp_dlna_native_info_value_new_int (value));
+ gupnp_dlna_info_value_new_int (value));
}
gboolean
@@ -161,7 +161,7 @@ gupnp_dlna_native_info_set_add_unsupported_int
return insert_value
(info_set,
name,
- gupnp_dlna_native_info_value_new_unsupported_int ());
+ gupnp_dlna_info_value_new_unsupported_int ());
}
gboolean
@@ -175,7 +175,7 @@ gupnp_dlna_native_info_set_add_string (GUPnPDLNANativeInfoSet *info_set,
return insert_value (info_set,
name,
- gupnp_dlna_native_info_value_new_string (value));
+ gupnp_dlna_info_value_new_string (value));
}
gboolean
@@ -189,7 +189,7 @@ gupnp_dlna_native_info_set_add_unsupported_string
return insert_value
(info_set,
name,
- gupnp_dlna_native_info_value_new_unsupported_string ());
+ gupnp_dlna_info_value_new_unsupported_string ());
}
gboolean
@@ -214,7 +214,7 @@ gupnp_dlna_native_info_set_fits_restriction
gupnp_dlna_restriction_get_entries
(restriction));
while (g_hash_table_iter_next (&iter, &key, &value)) {
- GUPnPDLNANativeInfoValue *info_value;
+ GUPnPDLNAInfoValue *info_value;
GUPnPDLNAValueList *value_list;
gboolean unsupported;
@@ -264,7 +264,7 @@ gupnp_dlna_native_info_set_to_string (GUPnPDLNANativeInfoSet *info_set)
str = g_string_new (info_set->mime ? info_set->mime : "(null)");
g_hash_table_iter_init (&iter, info_set->entries);
while (g_hash_table_iter_next (&iter, &key, &value)) {
- gchar *raw = gupnp_dlna_native_info_value_to_string (value);
+ gchar *raw = gupnp_dlna_info_value_to_string (value);
g_string_append_printf (str, ", %s=%s", (gchar *) key, raw);
g_free (raw);
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 c1862b8..9b5b30f 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
@@ -25,7 +25,7 @@
struct _GUPnPDLNANativeValueVTable {
gboolean
(* is_superset) (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *info);
+ GUPnPDLNAInfoValue *info);
GUPnPDLNANativeValue *
(* copy) (GUPnPDLNANativeValue *base,
@@ -58,7 +58,7 @@ struct _GUPnPDLNANativeValueSingle {
static gboolean
single_is_superset (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *info);
+ GUPnPDLNAInfoValue *info);
static GUPnPDLNANativeValue *
single_copy (GUPnPDLNANativeValue *base,
@@ -91,13 +91,13 @@ static GUPnPDLNANativeValueVTable single_vtable = {
static gboolean
single_is_superset (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *info)
+ GUPnPDLNAInfoValue *info)
{
GUPnPDLNANativeValueSingle *value = (GUPnPDLNANativeValueSingle *) base;
GUPnPDLNAValueType *info_type =
- gupnp_dlna_native_info_value_get_type (info);
+ gupnp_dlna_info_value_get_type (info);
GUPnPDLNAValueUnion *info_value =
- gupnp_dlna_native_info_value_get_value (info);
+ gupnp_dlna_info_value_get_value (info);
return gupnp_dlna_value_type_is_equal (info_type,
&value->value,
@@ -174,7 +174,7 @@ struct _GUPnPDLNANativeValueRange {
static gboolean
range_is_superset (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *info);
+ GUPnPDLNAInfoValue *info);
static GUPnPDLNANativeValue *
range_copy (GUPnPDLNANativeValue *base,
@@ -207,13 +207,13 @@ static GUPnPDLNANativeValueVTable range_vtable = {
static gboolean
range_is_superset (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *info)
+ GUPnPDLNAInfoValue *info)
{
GUPnPDLNANativeValueRange *range = (GUPnPDLNANativeValueRange *) base;
GUPnPDLNAValueType *info_type =
- gupnp_dlna_native_info_value_get_type (info);
+ gupnp_dlna_info_value_get_type (info);
GUPnPDLNAValueUnion *info_value =
- gupnp_dlna_native_info_value_get_value (info);
+ gupnp_dlna_info_value_get_value (info);
return gupnp_dlna_value_type_is_in_range (info_type,
&range->min,
@@ -367,7 +367,7 @@ gupnp_dlna_native_value_new_ranged (GUPnPDLNAValueType *type,
gboolean
gupnp_dlna_native_value_is_superset (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *single)
+ GUPnPDLNAInfoValue *single)
{
g_return_val_if_fail (base != NULL, FALSE);
g_return_val_if_fail (single != NULL, FALSE);
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 708160c..614b002 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
@@ -25,7 +25,7 @@
#include <glib.h>
#include <glib-object.h>
-#include "gupnp-dlna-native-info-value.h"
+#include "gupnp-dlna-info-value.h"
#include "gupnp-dlna-value-type.h"
G_BEGIN_DECLS
@@ -48,7 +48,7 @@ gupnp_dlna_native_value_new_ranged (GUPnPDLNAValueType *type,
gboolean
gupnp_dlna_native_value_is_superset (GUPnPDLNANativeValue *base,
- GUPnPDLNANativeInfoValue *single);
+ GUPnPDLNAInfoValue *single);
GUPnPDLNANativeValue *
gupnp_dlna_native_value_copy (GUPnPDLNANativeValue *base,
diff --git a/libgupnp-dlna/profile-backends/native/sets/sets.am b/libgupnp-dlna/profile-backends/native/sets/sets.am
index e1de012..8c95d27 100644
--- a/libgupnp-dlna/profile-backends/native/sets/sets.am
+++ b/libgupnp-dlna/profile-backends/native/sets/sets.am
@@ -1,7 +1,5 @@
sets_sources = \
profile-backends/native/sets/gupnp-dlna-native-info-set.c \
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-value.c \
profile-backends/native/sets/gupnp-dlna-native-value.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]