diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-09 08:37:33 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-09 08:37:33 +0300 |
commit | fcf68752e687123a171b1144f78f8eba1625a204 (patch) | |
tree | 2970a44e556502c107e3c266ff911c4790a26dc0 /src/modules/dbus/iface-card.c | |
parent | 1457df40eee692834d1c5faf95ca0057d74f86d1 (diff) |
dbus: Three entangled changes:
* Make the dbus object constructors take a pa_dbusiface_core pointer
as an argument. Remove the path_prefix argument.
* Expose the core object path as a constant in protocol-dbus.h.
* Move the core interface name constant from iface-core.h to
protocol-dbus.h.
Diffstat (limited to 'src/modules/dbus/iface-card.c')
-rw-r--r-- | src/modules/dbus/iface-card.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c index db6aa26f..e203c395 100644 --- a/src/modules/dbus/iface-card.c +++ b/src/modules/dbus/iface-card.c @@ -24,25 +24,30 @@ #endif #include <pulsecore/core-util.h> +#include <pulsecore/protocol-dbus.h> #include "iface-card.h" #define OBJECT_NAME "card" struct pa_dbusiface_card { + pa_dbusiface_core *core; + pa_card *card; char *path; }; -pa_dbusiface_card *pa_dbusiface_card_new(pa_card *card, const char *path_prefix) { - pa_dbusiface_card *c; +pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card) { + pa_dbusiface_card *c = NULL; + + pa_assert(core); pa_assert(card); - pa_assert(path_prefix); - c = pa_xnew(pa_dbusiface_card, 1); + c = pa_xnew0(pa_dbusiface_card, 1); + c->core = core; c->card = card; - c->path = pa_sprintf_malloc("%s/%s%u", path_prefix, OBJECT_NAME, card->index); + c->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, card->index); return c; } |