summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e9db411)
Change-Id: Ia2c56e65d5900f67d0089290663cfb0c95bb6a85
Signed-off-by: Deokhyun Kim <dukan.kim@samsung.com>
- bluetooth_device_info_t info;
+ bluetooth_device_info_t *info;
BT_CHECK_PARAMETER(out_param2, return);
BT_CHECK_PARAMETER(dev_list, return);
BT_CHECK_PARAMETER(out_param2, return);
BT_CHECK_PARAMETER(dev_list, return);
for (i = 0; i < size; i++) {
bluetooth_device_info_t *dev_info = NULL;
for (i = 0; i < size; i++) {
bluetooth_device_info_t *dev_info = NULL;
- info = g_array_index(out_param2,
+ info = &g_array_index(out_param2,
bluetooth_device_info_t, i);
bluetooth_device_info_t, i);
- dev_info = g_memdup(&info, sizeof(bluetooth_device_info_t));
+ dev_info = g_memdup(info, sizeof(bluetooth_device_info_t));
if (dev_info)
g_ptr_array_add(*dev_list, (gpointer)dev_info);
if (dev_info)
g_ptr_array_add(*dev_list, (gpointer)dev_info);
media_metadata_attributes_t *metadata)
{
int result;
media_metadata_attributes_t *metadata)
{
int result;
- media_metadata_t meta_data;
+ media_metadata_t *meta_data;
BT_CHECK_PARAMETER(metadata, return);
BT_CHECK_ENABLED(return);
BT_CHECK_PARAMETER(metadata, return);
BT_CHECK_ENABLED(return);
result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AVRCP_GET_TRACK_INFO,
in_param1, in_param2, in_param3, in_param4, &out_param);
result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AVRCP_GET_TRACK_INFO,
in_param1, in_param2, in_param3, in_param4, &out_param);
- memset(&meta_data, 0x00, sizeof(media_metadata_t));
-
- meta_data = g_array_index(out_param, media_metadata_t, 0);
+ meta_data = &g_array_index(out_param, media_metadata_t, 0);
- metadata->title = g_strdup(meta_data.title);
- metadata->artist = g_strdup(meta_data.artist);
- metadata->album = g_strdup(meta_data.album);
- metadata->genre = g_strdup(meta_data.genre);
- metadata->total_tracks = meta_data.total_tracks;
- metadata->number = meta_data.number;
- metadata->duration = (int64_t) meta_data.duration;
+ metadata->title = g_strdup(meta_data->title);
+ metadata->artist = g_strdup(meta_data->artist);
+ metadata->album = g_strdup(meta_data->album);
+ metadata->genre = g_strdup(meta_data->genre);
+ metadata->total_tracks = meta_data->total_tracks;
+ metadata->number = meta_data->number;
+ metadata->duration = (int64_t) meta_data->duration;
BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
BT_DBG("BT_OPP_PUSH_FILES");
int i;
bluetooth_device_address_t address = { {0} };
BT_DBG("BT_OPP_PUSH_FILES");
int i;
bluetooth_device_address_t address = { {0} };
char **file_path;
int file_count;
GArray *param2;
char **file_path;
int file_count;
GArray *param2;
__bt_fill_garray_from_variant(in_param2, param2);
for (i = 0; i < file_count; i++) {
__bt_fill_garray_from_variant(in_param2, param2);
for (i = 0; i < file_count; i++) {
- path = g_array_index(param2, bt_file_path_t, i);
- file_path[i] = g_strdup(path.path);
+ path = &g_array_index(param2, bt_file_path_t, i);
+ file_path[i] = g_strdup(path->path);
}
BT_DBG("_bt_opp_client_push_files");
result = _bt_opp_client_push_files(request_id, context,
}
BT_DBG("_bt_opp_client_push_files");
result = _bt_opp_client_push_files(request_id, context,
for (i = 0; i < (addr_list->len / sizeof(bluetooth_device_address_t)); i++) {
char address[BT_ADDRESS_STRING_SIZE];
for (i = 0; i < (addr_list->len / sizeof(bluetooth_device_address_t)); i++) {
char address[BT_ADDRESS_STRING_SIZE];
- bluetooth_device_address_t addr = g_array_index(addr_list, bluetooth_device_address_t, i);
- _bt_convert_addr_type_to_string(address, addr.addr);
+ bluetooth_device_address_t *addr = &g_array_index(addr_list, bluetooth_device_address_t, i);
+ _bt_convert_addr_type_to_string(address, addr->addr);
BT_INFO("device[%s] is in blacklist uuid, will be disconnected", address);
// TODO: need to implement disconnect logic
}
BT_INFO("device[%s] is in blacklist uuid, will be disconnected", address);
// TODO: need to implement disconnect logic
}
for (i = 0; i < (addr_list->len / sizeof(bluetooth_device_address_t)); i++) {
char address[BT_ADDRESS_STRING_SIZE];
for (i = 0; i < (addr_list->len / sizeof(bluetooth_device_address_t)); i++) {
char address[BT_ADDRESS_STRING_SIZE];
- bluetooth_device_address_t addr = g_array_index(addr_list, bluetooth_device_address_t, i);
- _bt_convert_addr_type_to_string(address, addr.addr);
+ bluetooth_device_address_t *addr = &g_array_index(addr_list, bluetooth_device_address_t, i);
+ _bt_convert_addr_type_to_string(address, addr->addr);
BT_INFO("device[%s] is in blacklist uuid, will be disconnected", address);
// TODO: need to implement disconnect logic
}
BT_INFO("device[%s] is in blacklist uuid, will be disconnected", address);
// TODO: need to implement disconnect logic
}
BT_DBG("BT_OPP_PUSH_FILES");
int i;
bluetooth_device_address_t address = { {0} };
BT_DBG("BT_OPP_PUSH_FILES");
int i;
bluetooth_device_address_t address = { {0} };
char **file_path;
int file_count;
GArray *param2;
char **file_path;
int file_count;
GArray *param2;
__bt_fill_garray_from_variant(in_param2, param2);
for (i = 0; i < file_count; i++) {
__bt_fill_garray_from_variant(in_param2, param2);
for (i = 0; i < file_count; i++) {
- path = g_array_index(param2, bt_file_path_t, i);
- file_path[i] = g_strdup(path.path);
+ path = &g_array_index(param2, bt_file_path_t, i);
+ file_path[i] = g_strdup(path->path);
}
BT_DBG("_bt_opp_client_push_files");
result = _bt_opp_client_push_files(request_id, context,
}
BT_DBG("_bt_opp_client_push_files");
result = _bt_opp_client_push_files(request_id, context,
GVariant *result;
GError *error = NULL;
GArray *device_list;
GVariant *result;
GError *error = NULL;
GArray *device_list;
- bluetooth_device_info_t info;
+ bluetooth_device_info_t *info;
guint size;
char *device_path = NULL;
char address[BT_ADDRESS_STRING_SIZE] = { 0 };
guint size;
char *device_path = NULL;
char address[BT_ADDRESS_STRING_SIZE] = { 0 };
for (i = 0; i < size; i++) {
for (i = 0; i < size; i++) {
- info = g_array_index(device_list,
+ info = &g_array_index(device_list,
bluetooth_device_info_t, i);
bluetooth_device_info_t, i);
- if (info.connected != BLUETOOTH_CONNECTED_LINK_NONE) {
+ if (info->connected != BLUETOOTH_CONNECTED_LINK_NONE) {
BT_DBG("Found Connected device");
BT_DBG("Found Connected device");
- _bt_convert_addr_type_to_string(address, info.device_address.addr);
+ _bt_convert_addr_type_to_string(address, info->device_address.addr);
device_path = _bt_get_device_object_path(address);
if (device_path == NULL)
continue;
device_path = _bt_get_device_object_path(address);
if (device_path == NULL)
continue;
- bluetooth_device_info_t info;
+ bluetooth_device_info_t *info;
char bond_address[BT_ADDRESS_STRING_SIZE] = { 0 };
gboolean ret = FALSE;
char bond_address[BT_ADDRESS_STRING_SIZE] = { 0 };
gboolean ret = FALSE;
size = (dev_list->len) / sizeof(bluetooth_device_info_t);
for (i = 0; i < size; i++) {
size = (dev_list->len) / sizeof(bluetooth_device_info_t);
for (i = 0; i < size; i++) {
- info = g_array_index(dev_list, bluetooth_device_info_t, i);
+ info = &g_array_index(dev_list, bluetooth_device_info_t, i);
_bt_convert_addr_type_to_string(bond_address,
_bt_convert_addr_type_to_string(bond_address,
- info.device_address.addr);
+ info->device_address.addr);
if (strcmp(bond_address, remote_address) != 0)
continue;
BT_INFO("Device address Matched");
j = 0;
if (strcmp(bond_address, remote_address) != 0)
continue;
BT_INFO("Device address Matched");
j = 0;
- while (j != info.service_index) {
+ while (j != info->service_index) {
if (type == BT_AUDIO_HSP) {
if (type == BT_AUDIO_HSP) {
- if (strcmp(info.uuids[j], HFP_HS_UUID) == 0) {
+ if (strcmp(info->uuids[j], HFP_HS_UUID) == 0) {
BT_INFO("HFP HS UUID exists");
ret = TRUE;
goto end;
}
} else if (type == BT_AUDIO_A2DP) {
BT_INFO("HFP HS UUID exists");
ret = TRUE;
goto end;
}
} else if (type == BT_AUDIO_A2DP) {
- if (strcmp(info.uuids[j], A2DP_SINK_UUID) == 0) {
+ if (strcmp(info->uuids[j], A2DP_SINK_UUID) == 0) {
BT_INFO("A2DP SINK UUID exists");
ret = TRUE;
goto end;
BT_INFO("A2DP SINK UUID exists");
ret = TRUE;
goto end;
GArray *dev_list = NULL;
int size = 0;
int i = 0;
GArray *dev_list = NULL;
int size = 0;
int i = 0;
- bluetooth_device_info_t info;
+ bluetooth_device_info_t *info;
char bond_address[BT_ADDRESS_STRING_SIZE] = { 0 };
if (device == NULL)
char bond_address[BT_ADDRESS_STRING_SIZE] = { 0 };
if (device == NULL)
_bt_get_bonded_devices(&dev_list);
size = (dev_list->len) / sizeof(bluetooth_device_info_t);
for (i = 0; i < size; i++) {
_bt_get_bonded_devices(&dev_list);
size = (dev_list->len) / sizeof(bluetooth_device_info_t);
for (i = 0; i < size; i++) {
- info = g_array_index(dev_list, bluetooth_device_info_t, i);
- _bt_convert_addr_type_to_string(bond_address, info.device_address.addr);
+ info = &g_array_index(dev_list, bluetooth_device_info_t, i);
+ _bt_convert_addr_type_to_string(bond_address, info->device_address.addr);
if (strcmp(bond_address, remote_address) == 0) {
BT_INFO("Match found");
if (strcmp(bond_address, remote_address) == 0) {
BT_INFO("Match found");
- memcpy(device, &info, sizeof(bluetooth_device_info_t));
+ memcpy(device, info, sizeof(bluetooth_device_info_t));
g_array_free(dev_list, TRUE);
return;
}
g_array_free(dev_list, TRUE);
return;
}
- bluetooth_device_info_t info;
+ bluetooth_device_info_t *info;
char bond_address[BT_ADDRESS_STRING_SIZE] = { 0 };
dev_list = g_array_new(FALSE, FALSE, sizeof(gchar));
_bt_get_bonded_devices(&dev_list);
size = (dev_list->len) / sizeof(bluetooth_device_info_t);
for (i = 0; i < size; i++) {
char bond_address[BT_ADDRESS_STRING_SIZE] = { 0 };
dev_list = g_array_new(FALSE, FALSE, sizeof(gchar));
_bt_get_bonded_devices(&dev_list);
size = (dev_list->len) / sizeof(bluetooth_device_info_t);
for (i = 0; i < size; i++) {
- info = g_array_index(dev_list, bluetooth_device_info_t, i);
+ info = &g_array_index(dev_list, bluetooth_device_info_t, i);
j = 0;
_bt_convert_addr_type_to_string(bond_address,
j = 0;
_bt_convert_addr_type_to_string(bond_address,
- info.device_address.addr);
+ info->device_address.addr);
if (strcmp(bond_address, remote_address) != 0)
continue;
BT_INFO("Device address Matched");
if (strcmp(bond_address, remote_address) != 0)
continue;
BT_INFO("Device address Matched");
- while (j != info.service_index) {
- BT_INFO("UUID %s", info.uuids[j]);
+ while (j != info->service_index) {
+ BT_INFO("UUID %s", info->uuids[j]);
if (connection_type == BT_AUDIO_A2DP) {
if (connection_type == BT_AUDIO_A2DP) {
- if (strcmp(info.uuids[j], A2DP_SINK_UUID) == 0) {
+ if (strcmp(info->uuids[j], A2DP_SINK_UUID) == 0) {
BT_INFO("Remote Device has A2DP Sink Support start timer");
BT_INFO("Remote Device has A2DP Sink Support start timer");
- _bt_headset_add_timer_function(BT_AUDIO_A2DP, &info);
+ _bt_headset_add_timer_function(BT_AUDIO_A2DP, info);
- if (strcmp(info.uuids[j], HFP_HS_UUID) == 0) {
+ if (strcmp(info->uuids[j], HFP_HS_UUID) == 0) {
BT_INFO("Remote Device has HFP Sink Support start timer");
BT_INFO("Remote Device has HFP Sink Support start timer");
- _bt_headset_add_timer_function(BT_AUDIO_HSP, &info);
+ _bt_headset_add_timer_function(BT_AUDIO_HSP, info);