From d36c5c97e53ac8865971bdd34ea27bf11bde49e1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Aug 2008 02:10:54 +0300 Subject: rename props.[ch] to shared.[ch] --- src/Makefile.am | 4 +- src/modules/dbus-util.c | 2 +- src/modules/module-x11-publish.c | 2 +- src/pulsecore/authkey-prop.c | 2 +- src/pulsecore/cli-command.c | 2 +- src/pulsecore/core.c | 2 +- src/pulsecore/props.c | 138 --------------------------------------- src/pulsecore/props.h | 61 ----------------- src/pulsecore/protocol-native.c | 2 +- src/pulsecore/shared.c | 138 +++++++++++++++++++++++++++++++++++++++ src/pulsecore/shared.h | 61 +++++++++++++++++ src/pulsecore/x11wrap.c | 2 +- 12 files changed, 208 insertions(+), 208 deletions(-) delete mode 100644 src/pulsecore/props.c delete mode 100644 src/pulsecore/props.h create mode 100644 src/pulsecore/shared.c create mode 100644 src/pulsecore/shared.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 63707192..268409bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -686,7 +686,7 @@ noinst_HEADERS = \ 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 \ @@ -758,7 +758,7 @@ libpulsecore_la_SOURCES += \ 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 \ diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index e18b6ab9..8e0066bc 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "dbus-util.h" diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c index d0ce344f..4ef4873a 100644 --- a/src/modules/module-x11-publish.c +++ b/src/modules/module-x11-publish.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include "module-x11-publish-symdef.h" diff --git a/src/pulsecore/authkey-prop.c b/src/pulsecore/authkey-prop.c index 9e147ec1..d52bdcf4 100644 --- a/src/pulsecore/authkey-prop.c +++ b/src/pulsecore/authkey-prop.c @@ -27,7 +27,7 @@ #include -#include +#include #include #include #include diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c index 43ec1042..0bd4070c 100644 --- a/src/pulsecore/cli-command.c +++ b/src/pulsecore/cli-command.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index 9aabd37d..fd836fb2 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/pulsecore/props.c b/src/pulsecore/props.c deleted file mode 100644 index 1bfb297a..00000000 --- a/src/pulsecore/props.c +++ /dev/null @@ -1,138 +0,0 @@ -/*** - 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 -#endif - -#include -#include -#include - -#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); -} diff --git a/src/pulsecore/props.h b/src/pulsecore/props.h deleted file mode 100644 index dd3f94e2..00000000 --- a/src/pulsecore/props.h +++ /dev/null @@ -1,61 +0,0 @@ -#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 -#include - -/* 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 diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index f279b6af..853f2447 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/pulsecore/shared.c b/src/pulsecore/shared.c new file mode 100644 index 00000000..77d919d3 --- /dev/null +++ b/src/pulsecore/shared.c @@ -0,0 +1,138 @@ +/*** + 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 +#endif + +#include +#include +#include + +#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); +} diff --git a/src/pulsecore/shared.h b/src/pulsecore/shared.h new file mode 100644 index 00000000..dd3f94e2 --- /dev/null +++ b/src/pulsecore/shared.h @@ -0,0 +1,61 @@ +#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 +#include + +/* 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 diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c index 9186cf74..1519aa86 100644 --- a/src/pulsecore/x11wrap.c +++ b/src/pulsecore/x11wrap.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include -- cgit