diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
| commit | 01761bea1ce6539b97640123660c67d81c54318b (patch) | |
| tree | a9eb2957891081a1ae111b6c7f53a8d2108597b2 /audio | |
| parent | 0019156df63264bdb80131f947833cd2a1293994 (diff) | |
| parent | 18614bd2b008cb9f3879990883c569c37b72f195 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/aloks-clone
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/manager.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/audio/manager.c b/audio/manager.c index 2484e932..7df5c292 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -673,7 +673,7 @@ static int gateway_server_init(struct audio_adapter *adapter) static int audio_probe(struct btd_device *device, GSList *records) { - struct adapter *adapter = device_get_adapter(device); + struct btd_adapter *adapter = device_get_adapter(device); const gchar *path = device_get_path(device); const char *source, *destination; bdaddr_t src, dst; @@ -726,7 +726,7 @@ static struct audio_adapter *create_audio_adapter(const char *path, bdaddr_t *sr return adp; } -static struct audio_adapter *get_audio_adapter(struct adapter *adapter) +static struct audio_adapter *get_audio_adapter(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); @@ -747,7 +747,7 @@ static struct audio_adapter *get_audio_adapter(struct adapter *adapter) return adp; } -static int headset_server_probe(struct adapter *adapter) +static int headset_server_probe(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); @@ -761,7 +761,7 @@ static int headset_server_probe(struct adapter *adapter) return headset_server_init(adp); } -static void headset_server_remove(struct adapter *adapter) +static void headset_server_remove(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); @@ -793,7 +793,7 @@ static void headset_server_remove(struct adapter *adapter) } } -static int gateway_server_probe(struct adapter *adapter) +static int gateway_server_probe(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); @@ -807,7 +807,7 @@ static int gateway_server_probe(struct adapter *adapter) return gateway_server_init(adp); } -static void gateway_server_remove(struct adapter *adapter) +static void gateway_server_remove(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); @@ -829,7 +829,7 @@ static void gateway_server_remove(struct adapter *adapter) } } -static int a2dp_server_probe(struct adapter *adapter) +static int a2dp_server_probe(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); @@ -843,7 +843,7 @@ static int a2dp_server_probe(struct adapter *adapter) return a2dp_init(connection, config); } -static int avrcp_server_probe(struct adapter *adapter) +static int avrcp_server_probe(struct btd_adapter *adapter) { struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); |