changeset 3279:065ae0990247 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Thu, 09 Aug 2007 03:13:25 -0500
parents 04df6bd984ad (diff) 949480cc9d98 (current diff)
children a26138e391ee
files
diffstat 3 files changed, 223 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/Makefile	Thu Aug 09 10:08:54 2007 +0200
+++ b/src/audacious/Makefile	Thu Aug 09 03:13:25 2007 -0500
@@ -52,6 +52,7 @@
 	plugin.h \
 	strings.h \
 	titlestring.h \
+	tuple.h \
 	ui_fileinfopopup.h \
 	ui_lastfm.h\
 	ui_preferences.h \
@@ -96,6 +97,7 @@
 	signals.c \
 	strings.c \
 	titlestring.c \
+	tuple.c \
 	skin.c \
 	ui_about.c \
 	ui_albumart.c \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audacious/tuple.c	Thu Aug 09 03:13:25 2007 -0500
@@ -0,0 +1,177 @@
+/*
+ * Audacious
+ * Copyright (c) 2006-2007 Audacious team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; under version 3 of the License.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <glib.h>
+#include <mowgli.h>
+
+#include "tuple.h"
+
+struct _Tuple {
+    mowgli_object_t parent;
+    mowgli_dictionary_t *dict;
+};
+
+typedef struct {
+    TupleValueType type;
+    union {
+        gchar *string;
+        gint integer;
+    } value;
+} TupleValue;
+
+static mowgli_heap_t *tuple_heap = NULL;
+static mowgli_heap_t *tuple_value_heap = NULL;
+static mowgli_object_class_t tuple_klass;
+
+static void
+tuple_destroy(Tuple *tuple)
+{
+    mowgli_dictionary_destroy(tuple->dict);
+    mowgli_heap_free(tuple_heap, tuple);
+}
+
+Tuple *
+tuple_new(void)
+{
+    Tuple *tuple;
+
+    if (tuple_heap == NULL)
+    {
+        tuple_heap = mowgli_heap_create(sizeof(Tuple), 256);
+        tuple_value_heap = mowgli_heap_create(sizeof(TupleValue), 512);
+        mowgli_object_class_init(&tuple_klass, "audacious.tuple", tuple_destroy, FALSE);
+    }
+
+    /* FIXME: use mowgli_object_bless_from_class() in mowgli 0.4
+       when it is released --nenolod */
+    tuple = mowgli_heap_alloc(tuple_heap);
+    mowgli_object_init(mowgli_object(tuple), NULL, &tuple_klass, NULL);
+
+    tuple->dict = mowgli_dictionary_create(g_ascii_strcasecmp);
+
+    return tuple;
+}
+
+gboolean
+tuple_associate_string(Tuple *tuple, const gchar *field, const gchar *string)
+{
+    TupleValue *value;
+
+    g_return_val_if_fail(tuple != NULL, FALSE);
+    g_return_val_if_fail(field != NULL, FALSE);
+    g_return_val_if_fail(string != NULL, FALSE);
+
+    if (mowgli_dictionary_find(tuple->dict, field))
+        tuple_disassociate(tuple, field);
+
+    value = mowgli_heap_alloc(tuple_value_heap);
+    value->type = TUPLE_STRING;
+    value->value.string = g_strdup(string);
+
+    mowgli_dictionary_add(tuple->dict, field, value);
+
+    return TRUE;
+}
+
+gboolean
+tuple_associate_int(Tuple *tuple, const gchar *field, gint integer)
+{
+    TupleValue *value;
+
+    g_return_val_if_fail(tuple != NULL, FALSE);
+    g_return_val_if_fail(field != NULL, FALSE);
+
+    if (mowgli_dictionary_find(tuple->dict, field))
+        tuple_disassociate(tuple, field);
+
+    value = mowgli_heap_alloc(tuple_value_heap);
+    value->type = TUPLE_INT;
+    value->value.integer = integer;
+
+    mowgli_dictionary_add(tuple->dict, field, value);
+
+    return TRUE;
+}
+
+void
+tuple_disassociate(Tuple *tuple, const gchar *field)
+{
+    TupleValue *value;
+
+    g_return_if_fail(tuple != NULL);
+    g_return_if_fail(field != NULL);
+
+    /* why _delete()? because _delete() returns the dictnode's data on success */
+    if ((value = mowgli_dictionary_delete(tuple->dict, field)) == NULL)
+        return;
+
+    if (value->type == TUPLE_STRING)
+        g_free(value->value.string);
+
+    mowgli_heap_free(tuple_value_heap, value);
+}
+
+TupleValueType
+tuple_get_value_type(Tuple *tuple, const gchar *field)
+{
+    TupleValue *value;
+
+    g_return_if_fail(tuple != NULL);
+    g_return_if_fail(field != NULL);
+
+    if ((value = mowgli_dictionary_retrieve(tuple->dict, field)) == NULL)
+        return TUPLE_UNKNOWN;
+
+    return value->type;
+}
+
+const gchar *
+tuple_get_string(Tuple *tuple, const gchar *field)
+{
+    TupleValue *value;
+
+    g_return_if_fail(tuple != NULL);
+    g_return_if_fail(field != NULL);
+
+    if ((value = mowgli_dictionary_retrieve(tuple->dict, field)) == NULL)
+        return NULL;
+
+    if (value->type != TUPLE_STRING)
+        mowgli_throw_exception_val(audacious.tuple.invalid_type_request, NULL);
+
+    return value->value.string;
+}
+
+int
+tuple_get_int(Tuple *tuple, const gchar *field)
+{
+    TupleValue *value;
+
+    g_return_if_fail(tuple != NULL);
+    g_return_if_fail(field != NULL);
+
+    if ((value = mowgli_dictionary_retrieve(tuple->dict, field)) == NULL)
+        return NULL;
+
+    if (value->type != TUPLE_INT)
+        mowgli_throw_exception_val(audacious.tuple.invalid_type_request, NULL);
+
+    return value->value.integer;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audacious/tuple.h	Thu Aug 09 03:13:25 2007 -0500
@@ -0,0 +1,44 @@
+/*
+ * Audacious
+ * Copyright (c) 2006-2007 Audacious team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; under version 3 of the License.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef __AUDACIOUS_TUPLE_H__
+#define __AUDACIOUS_TUPLE_H__
+
+#include <glib.h>
+#include <mowgli.h>
+
+struct _Tuple;
+typedef struct _Tuple Tuple;
+
+typedef enum {
+    TUPLE_STRING,
+    TUPLE_INT,
+    TUPLE_UNKNOWN
+} TupleValueType;
+
+Tuple *tuple_new(void);
+gboolean tuple_associate_string(Tuple *tuple, const gchar *field, const gchar *string);
+gboolean tuple_associate_int(Tuple *tuple, const gchar *field, gint integer);
+void tuple_disassociate(Tuple *tuple, const gchar *field);
+TupleValueType tuple_get_value_type(Tuple *tuple, const gchar *field);
+const gchar *tuple_get_string(Tuple *tuple, const gchar *field);
+int tuple_get_int(Tuple *tuple, const gchar *field);
+
+#endif