diff options
| author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-03-31 00:56:20 +0530 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-03-31 11:04:39 +0100 |
| commit | 62f181aa2834ceea1d759e75d59c4feae0f9b9f7 (patch) | |
| tree | 684f3406cdb56cfd1e49ed2e42ccbe8ee1abb0d8 /src/modules/bluetooth/bluetooth-util.c | |
| parent | fce93eb6254a12ff16b20426017efd540b982ef7 (diff) | |
bluetooth: Pull a2dp-codecs.h from BlueZ
This pulls a2dp-codecs.h from BlueZ which contains the capabilities
structures for SBC and MPEG. We currently have these manually added to
ipc.h, so pulling this header makes our files identical to upstream.
Diffstat (limited to 'src/modules/bluetooth/bluetooth-util.c')
| -rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 5d388ceb..740b317a 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -29,6 +29,7 @@ #include "bluetooth-util.h" #include "ipc.h" +#include "a2dp-codecs.h" #define HFP_AG_ENDPOINT "/MediaEndpoint/HFPAG" #define A2DP_SOURCE_ENDPOINT "/MediaEndpoint/A2DPSource" @@ -58,9 +59,6 @@ " </interface>" \ "</node>" -#define MAX_BITPOOL 64 -#define MIN_BITPOOL 2U - struct pa_bluetooth_discovery { PA_REFCNT_DECLARE; @@ -636,7 +634,7 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const uint8_t *caps = &capability; pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &caps, 1); } else { - sbc_capabilities_raw_t capabilities; + a2dp_sbc_t capabilities; uint8_t *caps = (uint8_t *) &capabilities; capabilities.channel_mode = BT_A2DP_CHANNEL_MODE_MONO | BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL | @@ -1277,7 +1275,7 @@ static uint8_t a2dp_default_bitpool(uint8_t freq, uint8_t mode) { static DBusMessage *endpoint_select_configuration(DBusConnection *c, DBusMessage *m, void *userdata) { pa_bluetooth_discovery *y = userdata; - sbc_capabilities_raw_t *cap, config; + a2dp_sbc_t *cap, config; uint8_t *pconf = (uint8_t *) &config; int i, size; DBusMessage *r; |