From 9a77d2f81d693d64b63d38be7214626dedf91e11 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 21 Jul 2009 00:04:52 +0300 Subject: Add the forgotten src/modules/dbus directory to git. --- src/modules/dbus/iface-client.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/modules/dbus/iface-client.h (limited to 'src/modules/dbus/iface-client.h') diff --git a/src/modules/dbus/iface-client.h b/src/modules/dbus/iface-client.h new file mode 100644 index 00000000..62cca7f8 --- /dev/null +++ b/src/modules/dbus/iface-client.h @@ -0,0 +1,40 @@ +#ifndef foodbusifaceclienthfoo +#define foodbusifaceclienthfoo + +/*** + This file is part of PulseAudio. + + Copyright 2009 Tanu Kaskinen + + 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.1 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. +***/ + +/* This object implements the D-Bus interface org.PulseAudio.Core1.Card. + * + * See http://pulseaudio.org/wiki/DBusInterface for the Card interface + * documentation. + */ + +#include + +typedef struct pa_dbusiface_client pa_dbusiface_client; + +pa_dbusiface_client *pa_dbusiface_client_new(pa_client *client, const char *path_prefix); +void pa_dbusiface_client_free(pa_dbusiface_client *c); + +const char *pa_dbusiface_client_get_path(pa_dbusiface_client *c); + +#endif -- cgit From fcf68752e687123a171b1144f78f8eba1625a204 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Sun, 9 Aug 2009 08:37:33 +0300 Subject: 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. --- src/modules/dbus/iface-client.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/modules/dbus/iface-client.h') diff --git a/src/modules/dbus/iface-client.h b/src/modules/dbus/iface-client.h index 62cca7f8..ff906256 100644 --- a/src/modules/dbus/iface-client.h +++ b/src/modules/dbus/iface-client.h @@ -30,9 +30,11 @@ #include +#include "iface-core.h" + typedef struct pa_dbusiface_client pa_dbusiface_client; -pa_dbusiface_client *pa_dbusiface_client_new(pa_client *client, const char *path_prefix); +pa_dbusiface_client *pa_dbusiface_client_new(pa_dbusiface_core *core, pa_client *client); void pa_dbusiface_client_free(pa_dbusiface_client *c); const char *pa_dbusiface_client_get_path(pa_dbusiface_client *c); -- cgit From c7f4ed3c7a0453ff29181fe03666e0c7d3822317 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Sat, 15 Aug 2009 17:08:21 +0300 Subject: dbusiface-client: Fix the interface name. --- src/modules/dbus/iface-client.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/modules/dbus/iface-client.h') diff --git a/src/modules/dbus/iface-client.h b/src/modules/dbus/iface-client.h index ff906256..e8f151cd 100644 --- a/src/modules/dbus/iface-client.h +++ b/src/modules/dbus/iface-client.h @@ -22,16 +22,19 @@ USA. ***/ -/* This object implements the D-Bus interface org.PulseAudio.Core1.Card. +/* This object implements the D-Bus interface org.PulseAudio.Core1.Client. * - * See http://pulseaudio.org/wiki/DBusInterface for the Card interface + * See http://pulseaudio.org/wiki/DBusInterface for the Client interface * documentation. */ #include +#include #include "iface-core.h" +#define PA_DBUSIFACE_CLIENT_INTERFACE PA_DBUS_CORE_INTERFACE ".Client" + typedef struct pa_dbusiface_client pa_dbusiface_client; pa_dbusiface_client *pa_dbusiface_client_new(pa_dbusiface_core *core, pa_client *client); -- cgit