diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c index 7caf2e8d4..5476acd06 100644 --- a/src/modules/bluetooth/backend-native.c +++ b/src/modules/bluetooth/backend-native.c @@ -53,14 +53,6 @@ struct transport_data { pa_mainloop_api *mainloop; }; -#define BLUEZ_SERVICE "org.bluez" -#define BLUEZ_MEDIA_TRANSPORT_INTERFACE BLUEZ_SERVICE ".MediaTransport1" - -#define BLUEZ_ERROR_NOT_SUPPORTED "org.bluez.Error.NotSupported" - -#define BLUEZ_PROFILE_MANAGER_INTERFACE BLUEZ_SERVICE ".ProfileManager1" -#define BLUEZ_PROFILE_INTERFACE BLUEZ_SERVICE ".Profile1" - #define HSP_AG_PROFILE "/Profile/HSPAGProfile" #define HSP_HS_PROFILE "/Profile/HSPHSProfile" diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c index 456486f34..6f18f73a8 100644 --- a/src/modules/bluetooth/bluez5-util.c +++ b/src/modules/bluetooth/bluez5-util.c @@ -42,15 +42,6 @@ #define WAIT_FOR_PROFILES_TIMEOUT_USEC (3 * PA_USEC_PER_SEC) -#define BLUEZ_SERVICE "org.bluez" -#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter1" -#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device1" -#define BLUEZ_MEDIA_INTERFACE BLUEZ_SERVICE ".Media1" -#define BLUEZ_MEDIA_ENDPOINT_INTERFACE BLUEZ_SERVICE ".MediaEndpoint1" -#define BLUEZ_MEDIA_TRANSPORT_INTERFACE BLUEZ_SERVICE ".MediaTransport1" - -#define BLUEZ_ERROR_NOT_SUPPORTED "org.bluez.Error.NotSupported" - #define A2DP_OBJECT_MANAGER_PATH "/MediaEndpoint" #define A2DP_SOURCE_ENDPOINT A2DP_OBJECT_MANAGER_PATH "/A2DPSource" #define A2DP_SINK_ENDPOINT A2DP_OBJECT_MANAGER_PATH "/A2DPSink" diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h index 64f37798f..191f0673b 100644 --- a/src/modules/bluetooth/bluez5-util.h +++ b/src/modules/bluetooth/bluez5-util.h @@ -25,6 +25,17 @@ #include "a2dp-codec-util.h" +#define BLUEZ_SERVICE "org.bluez" +#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter1" +#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device1" +#define BLUEZ_MEDIA_ENDPOINT_INTERFACE BLUEZ_SERVICE ".MediaEndpoint1" +#define BLUEZ_MEDIA_INTERFACE BLUEZ_SERVICE ".Media1" +#define BLUEZ_MEDIA_TRANSPORT_INTERFACE BLUEZ_SERVICE ".MediaTransport1" +#define BLUEZ_PROFILE_INTERFACE BLUEZ_SERVICE ".Profile1" +#define BLUEZ_PROFILE_MANAGER_INTERFACE BLUEZ_SERVICE ".ProfileManager1" + +#define BLUEZ_ERROR_NOT_SUPPORTED BLUEZ_SERVICE ".Error.NotSupported" + #define PA_BLUETOOTH_UUID_A2DP_SOURCE "0000110a-0000-1000-8000-00805f9b34fb" #define PA_BLUETOOTH_UUID_A2DP_SINK "0000110b-0000-1000-8000-00805f9b34fb"