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-device.h | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/modules/dbus/iface-device.h (limited to 'src/modules/dbus/iface-device.h') diff --git a/src/modules/dbus/iface-device.h b/src/modules/dbus/iface-device.h new file mode 100644 index 00000000..81ad1d84 --- /dev/null +++ b/src/modules/dbus/iface-device.h @@ -0,0 +1,46 @@ +#ifndef foodbusifacedevicehfoo +#define foodbusifacedevicehfoo + +/*** + 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 interfaces org.PulseAudio.Core1.Device, + * org.PulseAudio.Core1.Sink and org.PulseAudio.Core1.Source. + * + * See http://pulseaudio.org/wiki/DBusInterface for the interface + * documentation. + */ + +#include +#include + +typedef struct pa_dbusiface_device pa_dbusiface_device; + +pa_dbusiface_device *pa_dbusiface_device_new_sink(pa_sink *sink, const char *path_prefix); +pa_dbusiface_device *pa_dbusiface_device_new_source(pa_source *source, const char *path_prefix); +void pa_dbusiface_device_free(pa_dbusiface_device *d); + +const char *pa_dbusiface_device_get_path(pa_dbusiface_device *d); + +pa_sink *pa_dbusiface_device_get_sink(pa_dbusiface_device *d); +pa_source *pa_dbusiface_device_get_source(pa_dbusiface_device *d); + +#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-device.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/modules/dbus/iface-device.h') diff --git a/src/modules/dbus/iface-device.h b/src/modules/dbus/iface-device.h index 81ad1d84..1e9af83a 100644 --- a/src/modules/dbus/iface-device.h +++ b/src/modules/dbus/iface-device.h @@ -32,10 +32,12 @@ #include #include +#include "iface-core.h" + typedef struct pa_dbusiface_device pa_dbusiface_device; -pa_dbusiface_device *pa_dbusiface_device_new_sink(pa_sink *sink, const char *path_prefix); -pa_dbusiface_device *pa_dbusiface_device_new_source(pa_source *source, const char *path_prefix); +pa_dbusiface_device *pa_dbusiface_device_new_sink(pa_dbusiface_core *core, pa_sink *sink); +pa_dbusiface_device *pa_dbusiface_device_new_source(pa_dbusiface_core *core, pa_source *source); void pa_dbusiface_device_free(pa_dbusiface_device *d); const char *pa_dbusiface_device_get_path(pa_dbusiface_device *d); -- cgit From 91f626f777402fa6485658b04cbcdf2a7aac3f01 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Sat, 15 Aug 2009 06:18:41 +0300 Subject: dbusiface-device: Implement the Device and DevicePort D-Bus interfaces. --- src/modules/dbus/iface-device.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/modules/dbus/iface-device.h') diff --git a/src/modules/dbus/iface-device.h b/src/modules/dbus/iface-device.h index 1e9af83a..62e05e9a 100644 --- a/src/modules/dbus/iface-device.h +++ b/src/modules/dbus/iface-device.h @@ -29,11 +29,16 @@ * documentation. */ +#include #include #include #include "iface-core.h" +#define PA_DBUSIFACE_DEVICE_INTERFACE PA_DBUS_CORE_INTERFACE ".Device" +#define PA_DBUSIFACE_SINK_INTERFACE PA_DBUS_CORE_INTERFACE ".Sink" +#define PA_DBUSIFACE_SOURCE_INTERFACE PA_DBUS_CORE_INTERFACE ".Source" + typedef struct pa_dbusiface_device pa_dbusiface_device; pa_dbusiface_device *pa_dbusiface_device_new_sink(pa_dbusiface_core *core, pa_sink *sink); -- cgit