pulsecore/pid.h \
pulsecore/play-memchunk.h \
pulsecore/play-memblockq.h \
- pulsecore/props.h \
+ pulsecore/shared.h \
pulsecore/queue.h \
pulsecore/random.h \
pulsecore/resampler.h \
pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
pulsecore/play-memblockq.c pulsecore/play-memblockq.h \
pulsecore/poll.c pulsecore/poll.h \
- pulsecore/props.c pulsecore/props.h \
+ pulsecore/shared.c pulsecore/shared.h \
pulsecore/queue.c pulsecore/queue.h \
pulsecore/random.c pulsecore/random.h \
pulsecore/resampler.c pulsecore/resampler.h \
#include <pulse/xmalloc.h>
#include <pulse/timeval.h>
#include <pulsecore/log.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include "dbus-util.h"
#include <pulsecore/authkey.h>
#include <pulsecore/x11prop.h>
#include <pulsecore/strlist.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include "module-x11-publish-symdef.h"
#include <pulse/xmalloc.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/macro.h>
#include <pulsecore/log.h>
#include <pulsecore/refcnt.h>
#include <pulsecore/play-memchunk.h>
#include <pulsecore/autoload.h>
#include <pulsecore/sound-file-stream.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/core-util.h>
#include <pulsecore/core-error.h>
#include <pulsecore/core-scache.h>
#include <pulsecore/autoload.h>
#include <pulsecore/core-subscribe.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/random.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
+++ /dev/null
-/***
- This file is part of PulseAudio.
-
- Copyright 2004-2006 Lennart Poettering
-
- PulseAudio 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.
-
- PulseAudio 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 Lesser General Public License
- along with PulseAudio; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <pulse/xmalloc.h>
-#include <pulsecore/log.h>
-#include <pulsecore/macro.h>
-
-#include "props.h"
-
-typedef struct pa_shared {
- char *name; /* Points to memory allocated by the shared property system */
- void *data; /* Points to memory maintained by the caller */
-} pa_shared;
-
-/* Allocate a new shared property object */
-static pa_shared* shared_new(const char *name, void *data) {
- pa_shared* p;
-
- pa_assert(name);
- pa_assert(data);
-
- p = pa_xnew(pa_shared, 1);
- p->name = pa_xstrdup(name);
- p->data = data;
-
- return p;
-}
-
-/* Free a shared property object */
-static void shared_free(pa_shared *p) {
- pa_assert(p);
-
- pa_xfree(p->name);
- pa_xfree(p);
-}
-
-void* pa_shared_get(pa_core *c, const char *name) {
- pa_shared *p;
-
- pa_assert(c);
- pa_assert(name);
- pa_assert(c->shared);
-
- if (!(p = pa_hashmap_get(c->shared, name)))
- return NULL;
-
- return p->data;
-}
-
-int pa_shared_set(pa_core *c, const char *name, void *data) {
- pa_shared *p;
-
- pa_assert(c);
- pa_assert(name);
- pa_assert(data);
- pa_assert(c->shared);
-
- if (pa_hashmap_get(c->shared, name))
- return -1;
-
- p = shared_new(name, data);
- pa_hashmap_put(c->shared, p->name, p);
- return 0;
-}
-
-int pa_shared_remove(pa_core *c, const char *name) {
- pa_shared *p;
-
- pa_assert(c);
- pa_assert(name);
- pa_assert(c->shared);
-
- if (!(p = pa_hashmap_remove(c->shared, name)))
- return -1;
-
- shared_free(p);
- return 0;
-}
-
-void pa_shared_init(pa_core *c) {
- pa_assert(c);
-
- c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-}
-
-void pa_shared_cleanup(pa_core *c) {
- pa_assert(c);
-
- if (!c->shared)
- return;
-
- pa_assert(pa_hashmap_isempty(c->shared));
-
- pa_hashmap_free(c->shared, NULL, NULL);
- c->shared = NULL;
-
-}
-
-void pa_shared_dump(pa_core *c, pa_strbuf *s) {
- void *state = NULL;
- pa_shared *p;
-
- pa_assert(c);
- pa_assert(s);
-
- while ((p = pa_hashmap_iterate(c->shared, &state, NULL)))
- pa_strbuf_printf(s, "[%s] -> [%p]\n", p->name, p->data);
-}
-
-int pa_shared_replace(pa_core *c, const char *name, void *data) {
- pa_assert(c);
- pa_assert(name);
-
- pa_shared_remove(c, name);
- return pa_shared_set(c, name, data);
-}
+++ /dev/null
-#ifndef foosharedshfoo
-#define foosharedshfoo
-
-/***
- This file is part of PulseAudio.
-
- Copyright 2004-2006 Lennart Poettering
-
- PulseAudio 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.
-
- PulseAudio 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 Lesser General Public License
- along with PulseAudio; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA.
-***/
-
-#include <pulsecore/core.h>
-#include <pulsecore/strbuf.h>
-
-/* The shared property subsystem is to be used to share data between
- * modules. Consider them to be kind of "global" variables for a
- * core. Why not use the hashmap functions directly? The hashmap
- * functions copy neither the key nor value, while this property
- * system copies the key. Users of this system have to think about
- * reference counting themselves. */
-
-/* Note: please don't confuse this with the proplist framework in
- * pulse/proplist.[ch]! */
-
-/* Return a pointer to the value of the specified shared property. */
-void* pa_shared_get(pa_core *c, const char *name);
-
-/* Set the shared property 'name' to 'data'. This function fails in
- * case a property by this name already exists. The property data is
- * not copied or reference counted. This is the caller's job. */
-int pa_shared_set(pa_core *c, const char *name, void *data);
-
-/* Remove the specified shared property. Return non-zero on failure */
-int pa_shared_remove(pa_core *c, const char *name);
-
-/* A combination of pa_shared_remove() and pa_shared_set() */
-int pa_shared_replace(pa_core *c, const char *name, void *data);
-
-/* Free all memory used by the shared property system */
-void pa_shared_cleanup(pa_core *c);
-
-/* Initialize the shared property system */
-void pa_shared_init(pa_core *c);
-
-/* Dump the current set of shared properties */
-void pa_shared_dump(pa_core *c, pa_strbuf *s);
-
-#endif
#include <pulsecore/autoload.h>
#include <pulsecore/authkey-prop.h>
#include <pulsecore/strlist.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/sample-util.h>
#include <pulsecore/llist.h>
#include <pulsecore/creds.h>
--- /dev/null
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2004-2006 Lennart Poettering
+
+ PulseAudio 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.
+
+ PulseAudio 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 Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/xmalloc.h>
+#include <pulsecore/log.h>
+#include <pulsecore/macro.h>
+
+#include "shared.h"
+
+typedef struct pa_shared {
+ char *name; /* Points to memory allocated by the shared property system */
+ void *data; /* Points to memory maintained by the caller */
+} pa_shared;
+
+/* Allocate a new shared property object */
+static pa_shared* shared_new(const char *name, void *data) {
+ pa_shared* p;
+
+ pa_assert(name);
+ pa_assert(data);
+
+ p = pa_xnew(pa_shared, 1);
+ p->name = pa_xstrdup(name);
+ p->data = data;
+
+ return p;
+}
+
+/* Free a shared property object */
+static void shared_free(pa_shared *p) {
+ pa_assert(p);
+
+ pa_xfree(p->name);
+ pa_xfree(p);
+}
+
+void* pa_shared_get(pa_core *c, const char *name) {
+ pa_shared *p;
+
+ pa_assert(c);
+ pa_assert(name);
+ pa_assert(c->shared);
+
+ if (!(p = pa_hashmap_get(c->shared, name)))
+ return NULL;
+
+ return p->data;
+}
+
+int pa_shared_set(pa_core *c, const char *name, void *data) {
+ pa_shared *p;
+
+ pa_assert(c);
+ pa_assert(name);
+ pa_assert(data);
+ pa_assert(c->shared);
+
+ if (pa_hashmap_get(c->shared, name))
+ return -1;
+
+ p = shared_new(name, data);
+ pa_hashmap_put(c->shared, p->name, p);
+ return 0;
+}
+
+int pa_shared_remove(pa_core *c, const char *name) {
+ pa_shared *p;
+
+ pa_assert(c);
+ pa_assert(name);
+ pa_assert(c->shared);
+
+ if (!(p = pa_hashmap_remove(c->shared, name)))
+ return -1;
+
+ shared_free(p);
+ return 0;
+}
+
+void pa_shared_init(pa_core *c) {
+ pa_assert(c);
+
+ c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+}
+
+void pa_shared_cleanup(pa_core *c) {
+ pa_assert(c);
+
+ if (!c->shared)
+ return;
+
+ pa_assert(pa_hashmap_isempty(c->shared));
+
+ pa_hashmap_free(c->shared, NULL, NULL);
+ c->shared = NULL;
+
+}
+
+void pa_shared_dump(pa_core *c, pa_strbuf *s) {
+ void *state = NULL;
+ pa_shared *p;
+
+ pa_assert(c);
+ pa_assert(s);
+
+ while ((p = pa_hashmap_iterate(c->shared, &state, NULL)))
+ pa_strbuf_printf(s, "[%s] -> [%p]\n", p->name, p->data);
+}
+
+int pa_shared_replace(pa_core *c, const char *name, void *data) {
+ pa_assert(c);
+ pa_assert(name);
+
+ pa_shared_remove(c, name);
+ return pa_shared_set(c, name, data);
+}
--- /dev/null
+#ifndef foosharedshfoo
+#define foosharedshfoo
+
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2004-2006 Lennart Poettering
+
+ PulseAudio 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.
+
+ PulseAudio 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 Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#include <pulsecore/core.h>
+#include <pulsecore/strbuf.h>
+
+/* The shared property subsystem is to be used to share data between
+ * modules. Consider them to be kind of "global" variables for a
+ * core. Why not use the hashmap functions directly? The hashmap
+ * functions copy neither the key nor value, while this property
+ * system copies the key. Users of this system have to think about
+ * reference counting themselves. */
+
+/* Note: please don't confuse this with the proplist framework in
+ * pulse/proplist.[ch]! */
+
+/* Return a pointer to the value of the specified shared property. */
+void* pa_shared_get(pa_core *c, const char *name);
+
+/* Set the shared property 'name' to 'data'. This function fails in
+ * case a property by this name already exists. The property data is
+ * not copied or reference counted. This is the caller's job. */
+int pa_shared_set(pa_core *c, const char *name, void *data);
+
+/* Remove the specified shared property. Return non-zero on failure */
+int pa_shared_remove(pa_core *c, const char *name);
+
+/* A combination of pa_shared_remove() and pa_shared_set() */
+int pa_shared_replace(pa_core *c, const char *name, void *data);
+
+/* Free all memory used by the shared property system */
+void pa_shared_cleanup(pa_core *c);
+
+/* Initialize the shared property system */
+void pa_shared_init(pa_core *c);
+
+/* Dump the current set of shared properties */
+void pa_shared_dump(pa_core *c, pa_strbuf *s);
+
+#endif
#include <pulsecore/llist.h>
#include <pulsecore/log.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
projects / platform / upstream / pulseaudio.git / commitdiff