diff options
| author | Abhinav Kumar <abhinav.ku91@samsung.com> | 2015-02-18 18:46:18 +0530 |
|---|---|---|
| committer | Abhinav Kumar <abhinav.ku91@samsung.com> | 2015-02-18 18:46:18 +0530 |
| commit | d88e507a339b9c982b172b555834cd831c54f050 (patch) | |
| tree | 259714ffaa00ccfaa7b766edf79df0eb6353d3c8 /profiles/audio/control.c | |
| parent | ccb69ca94573c9863fe6324d77dae73ef7c01393 (diff) | |
| download | bluez-d88e507a339b9c982b172b555834cd831c54f050.tar.gz bluez-d88e507a339b9c982b172b555834cd831c54f050.tar.bz2 bluez-d88e507a339b9c982b172b555834cd831c54f050.zip | |
Changes for successful build after porting of Tizen 2.4 code
1> Copied Tizen 2.4 code in tizen branch.
2> Made changes to spec file for successful build. Also added a new file .gbs.conf.
Change-Id: I6e479759454c1978e68340a0f3541fb66b437044
Diffstat (limited to 'profiles/audio/control.c')
| -rw-r--r-- | profiles/audio/control.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/profiles/audio/control.c b/profiles/audio/control.c index 14f70213..3985362c 100644 --- a/profiles/audio/control.c +++ b/profiles/audio/control.c @@ -75,7 +75,7 @@ static void state_changed(struct btd_device *dev, avctp_state_t old_state, { struct control *control = user_data; DBusConnection *conn = btd_get_dbus_connection(); - const char *path = btd_device_get_path(dev); + const char *path = device_get_path(dev); switch (new_state) { case AVCTP_STATE_DISCONNECTED: @@ -96,6 +96,8 @@ static void state_changed(struct btd_device *dev, avctp_state_t old_state, g_dbus_emit_property_changed(conn, path, AUDIO_CONTROL_INTERFACE, "Connected"); break; + case AVCTP_STATE_BROWSING_CONNECTING: + case AVCTP_STATE_BROWSING_CONNECTED: default: return; } @@ -235,7 +237,7 @@ static void path_unregister(void *data) struct control *control = data; DBG("Unregistered interface %s on path %s", AUDIO_CONTROL_INTERFACE, - btd_device_get_path(control->dev)); + device_get_path(control->dev)); if (control->session) avctp_disconnect(control->session); @@ -257,7 +259,7 @@ void control_unregister(struct btd_service *service) struct btd_device *dev = btd_service_get_device(service); g_dbus_unregister_interface(btd_get_dbus_connection(), - btd_device_get_path(dev), + device_get_path(dev), AUDIO_CONTROL_INTERFACE); } @@ -287,7 +289,7 @@ static struct control *control_init(struct btd_service *service) control = g_new0(struct control, 1); if (!g_dbus_register_interface(btd_get_dbus_connection(), - btd_device_get_path(dev), + device_get_path(dev), AUDIO_CONTROL_INTERFACE, control_methods, NULL, control_properties, control, @@ -297,7 +299,7 @@ static struct control *control_init(struct btd_service *service) } DBG("Registered interface %s on path %s", AUDIO_CONTROL_INTERFACE, - btd_device_get_path(dev)); + device_get_path(dev)); control->dev = dev; control->avctp_id = avctp_add_state_cb(dev, state_changed, control); |