mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: move rtkit to module

Browse source 
Move the rtkit code to a module.
Make sure we don't need to include the dbus headers in the spa dbus
interface. This removes the dependency on dbus.
This commit is contained in:
Wim Taymans 2018-02-08 10:02:17 +01:00
parent 06ba8c9a7e
commit 9d4b0d8358
9 changed files with 185 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spa/include/spa/support/dbus.h
View file

@ -24,8 +24,6 @@
extern "C" {
#endif
#include <dbus/dbus.h>
#include <spa/support/loop.h>
#define SPA_TYPE__DBus SPA_TYPE_INTERFACE_BASE "DBus"
@ -33,6 +31,12 @@ extern "C" {
#define SPA_TYPE_DBUS__Connection SPA_TYPE_DBUS_BASE "Connection"
enum spa_dbus_type {
SPA_DBUS_TYPE_SESSION, /**< The login session bus */
SPA_DBUS_TYPE_SYSTEM, /**< The systemwide bus */
SPA_DBUS_TYPE_STARTER /**< The bus that started us, if any */
};
struct spa_dbus_connection {
#define SPA_VERSION_DBUS_CONNECTION 0
uint32_t version;
@ -40,9 +44,9 @@ struct spa_dbus_connection {
* Get the DBusConnection from a wraper
*
* \param conn the spa_dbus_connection wrapper
* \return a DBusConnection
* \return a pointer of type DBusConnection
*/
DBusConnection *(*get) (struct spa_dbus_connection *conn);
void *(*get) (struct spa_dbus_connection *conn);
/**
* Destroy a dbus connection wrapper
*
@ -69,13 +73,11 @@ struct spa_dbus {
*
* \param dbus the dbus manager
* \param type the bus type to wrap
* \param error location for the error
* \return a new dbus connection wrapper or NULL and \a error is
* set.
* \param error location for the DBusError
* \return a new dbus connection wrapper or NULL on error
*/
struct spa_dbus_connection * (*get_connection) (struct spa_dbus *dbus,
DBusBusType type,
DBusError *error);
enum spa_dbus_type type);
};
#define spa_dbus_get_connection(d,...) (d)->get_connection((d),__VA_ARGS__)