add wav/ogg reader, rework API

git-svn-id: file:///home/lennart/svn/public/libcanberra/trunk@6 01b60673-d06a-42c0-afdd-89cb8e0f78ac

1 files changed, 29 insertions, 17 deletions

diff --git a/common.h b/common.h
index 6d4ca55..02e10c2 100644
--- a/common.h
+++ b/common.h
@@ -1,27 +1,39 @@
-#ifndef foocanberracommonh
-#define foocanberracommonh
+#ifndef foocacommonh
+#define foocacommonh
 
-#include "canberra.h"
+/* $Id$ */
+
+/***
+  This file is part of libcanberra.
+
+  Copyright 2008 Lennart Poettering
 
-#define N_HASHTABLE 39
+  libcanberra 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.1 of the
+  License, or (at your option) any later version.
 
-typedef struct ca_prop {
-    char *key;
-    size_t nbytes;
-    struct ca_prop *next_in_slot, *next_item, *prev_item;
-} ca_prop;
+  libcanberra 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 libcanberra. If not, If not, see
+  <http://www.gnu.org/licenses/>.
+***/
+
+#include "canberra.h"
+#include "macro.h"
+#include "mutex.h"
 
 struct ca_context {
     ca_bool_t opened;
-    ca_prop *prop_hashtable[N_HASHTABLE];
-    ca_prop *first_item;
-    void *private;
-};
-
-#define CA_PROP_DATA(p) ((void*) ((char*) (p) + CA_ALIGN(sizeof(ca_prop))))
+    ca_mutex *mutex;
 
-ca_prop* ca_context_get(ca_context *c, const char *key);
-const char* ca_context_gets(ca_context *c, const char *key);
+    ca_proplist *props;
 
+    void *private;
+};
 
 #endif