Bluetooth: Use Zephyr standard log system instead of bluetooth/common/log
The `bluetooth/common/log.h` and `bluetooth/common/log.c` files have been removed. Files that were using them have been updated to use `zephyr/logging/log.h` instead. Those replacement have been done consequently: - `/BT_DBG/LOG_DBG/` - `/BT_ERR/LOG_ERR/` - `/BT_WARN/LOG_WRN/` - `/BT_INFO/LOG_INF/` - `/BT_HEXDUMP_DBG/LOG_HEXDUMP_DBG/` - `/BT_DBG_OBJ_ID/LOG_DBG_OBJ_ID/` Also, some files were relying on the `common/log.h` include to include `zephyr/bluetooth/hci.h`, in those cases the include of `hci.h` has been added. For files that were including `common/log.h` but not using any logs, the include has been removed and not replaced. Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
This commit is contained in:
Théo Battrel
Carles Cufí
parent
808266a493
commit
e458f5aae6
253 changed files with 7131 additions and 7180 deletions
|
|
@ -14,9 +14,10 @@
|
|||
#include "media_proxy_internal.h"
|
||||
#include "mpl_internal.h"
|
||||
|
||||
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_MPL)
|
||||
#define LOG_MODULE_NAME bt_mpl
|
||||
#include "common/log.h"
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
LOG_MODULE_REGISTER(bt_mpl, CONFIG_BT_MPL_LOG_LEVEL);
|
||||
|
||||
#include "ccid_internal.h"
|
||||
#include "mcs_internal.h"
|
||||
|
||||
|
|
@ -331,7 +332,7 @@ static uint32_t setup_segments_object(struct mpl_track *track)
|
|||
seg_size += seg->name_len;
|
||||
seg_size += sizeof(seg->pos);
|
||||
if (tot_size + seg_size > obj.content->size) {
|
||||
BT_DBG("Segments object out of space");
|
||||
LOG_DBG("Segments object out of space");
|
||||
break;
|
||||
}
|
||||
net_buf_simple_add_u8(obj.content, seg->name_len);
|
||||
|
|
@ -344,9 +345,9 @@ static uint32_t setup_segments_object(struct mpl_track *track)
|
|||
}
|
||||
|
||||
LOG_HEXDUMP_DBG(obj.content->data, obj.content->len, "Segments Object");
|
||||
BT_DBG("Segments object length: %d", obj.content->len);
|
||||
LOG_DBG("Segments object length: %d", obj.content->len);
|
||||
} else {
|
||||
BT_ERR("No seg!");
|
||||
LOG_ERR("No seg!");
|
||||
}
|
||||
|
||||
return obj.content->len;
|
||||
|
|
@ -403,10 +404,10 @@ static uint32_t setup_parent_group_object(struct mpl_group *group)
|
|||
next_size += record_size;
|
||||
}
|
||||
if (next_size > obj.content->size) {
|
||||
BT_WARN("Not room for full group in object");
|
||||
LOG_WRN("Not room for full group in object");
|
||||
}
|
||||
LOG_HEXDUMP_DBG(obj.content->data, obj.content->len, "Parent Group Object");
|
||||
BT_DBG("Group object length: %d", obj.content->len);
|
||||
LOG_DBG("Group object length: %d", obj.content->len);
|
||||
}
|
||||
return obj.content->len;
|
||||
}
|
||||
|
|
@ -435,10 +436,10 @@ static uint32_t setup_group_object(struct mpl_group *group)
|
|||
next_size += record_size;
|
||||
}
|
||||
if (next_size > obj.content->size) {
|
||||
BT_WARN("Not room for full group in object");
|
||||
LOG_WRN("Not room for full group in object");
|
||||
}
|
||||
LOG_HEXDUMP_DBG(obj.content->data, obj.content->len, "Group Object");
|
||||
BT_DBG("Group object length: %d", obj.content->len);
|
||||
LOG_DBG("Group object length: %d", obj.content->len);
|
||||
}
|
||||
return obj.content->len;
|
||||
}
|
||||
|
|
@ -455,7 +456,7 @@ static int add_icon_object(struct mpl_mediaplayer *pl)
|
|||
if (obj.busy) {
|
||||
/* TODO: Can there be a collision between select and internal */
|
||||
/* activities, like adding new objects? */
|
||||
BT_ERR("Object busy");
|
||||
LOG_ERR("Object busy");
|
||||
return 0;
|
||||
}
|
||||
obj.busy = true;
|
||||
|
|
@ -472,7 +473,7 @@ static int add_icon_object(struct mpl_mediaplayer *pl)
|
|||
|
||||
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
|
||||
if (ret < 0) {
|
||||
BT_WARN("Unable to add icon object, error %d", ret);
|
||||
LOG_WRN("Unable to add icon object, error %d", ret);
|
||||
obj.busy = false;
|
||||
|
||||
return ret;
|
||||
|
|
@ -490,7 +491,7 @@ static int add_current_track_segments_object(struct mpl_mediaplayer *pl)
|
|||
struct bt_uuid *segs_type = BT_UUID_OTS_TYPE_TRACK_SEGMENT;
|
||||
|
||||
if (obj.busy) {
|
||||
BT_ERR("Object busy");
|
||||
LOG_ERR("Object busy");
|
||||
return 0;
|
||||
}
|
||||
obj.busy = true;
|
||||
|
|
@ -507,7 +508,7 @@ static int add_current_track_segments_object(struct mpl_mediaplayer *pl)
|
|||
|
||||
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
|
||||
if (ret < 0) {
|
||||
BT_WARN("Unable to add track segments object: %d", ret);
|
||||
LOG_WRN("Unable to add track segments object: %d", ret);
|
||||
obj.busy = false;
|
||||
|
||||
return ret;
|
||||
|
|
@ -525,11 +526,11 @@ static int add_track_object(struct mpl_track *track)
|
|||
int ret;
|
||||
|
||||
if (obj.busy) {
|
||||
BT_ERR("Object busy");
|
||||
LOG_ERR("Object busy");
|
||||
return 0;
|
||||
}
|
||||
if (!track) {
|
||||
BT_ERR("No track");
|
||||
LOG_ERR("No track");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -549,7 +550,7 @@ static int add_track_object(struct mpl_track *track)
|
|||
|
||||
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
|
||||
if (ret < 0) {
|
||||
BT_WARN("Unable to add track object: %d", ret);
|
||||
LOG_WRN("Unable to add track object: %d", ret);
|
||||
obj.busy = false;
|
||||
|
||||
return ret;
|
||||
|
|
@ -567,7 +568,7 @@ static int add_parent_group_object(struct mpl_mediaplayer *pl)
|
|||
struct bt_uuid *group_type = BT_UUID_OTS_TYPE_GROUP;
|
||||
|
||||
if (obj.busy) {
|
||||
BT_ERR("Object busy");
|
||||
LOG_ERR("Object busy");
|
||||
return 0;
|
||||
}
|
||||
obj.busy = true;
|
||||
|
|
@ -584,7 +585,7 @@ static int add_parent_group_object(struct mpl_mediaplayer *pl)
|
|||
|
||||
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
|
||||
if (ret < 0) {
|
||||
BT_WARN("Unable to add parent group object");
|
||||
LOG_WRN("Unable to add parent group object");
|
||||
obj.busy = false;
|
||||
|
||||
return ret;
|
||||
|
|
@ -602,12 +603,12 @@ static int add_group_object(struct mpl_group *group)
|
|||
int ret;
|
||||
|
||||
if (obj.busy) {
|
||||
BT_ERR("Object busy");
|
||||
LOG_ERR("Object busy");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!group) {
|
||||
BT_ERR("No group");
|
||||
LOG_ERR("No group");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -627,7 +628,7 @@ static int add_group_object(struct mpl_group *group)
|
|||
|
||||
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
|
||||
if (ret < 0) {
|
||||
BT_WARN("Unable to add group object: %d", ret);
|
||||
LOG_WRN("Unable to add group object: %d", ret);
|
||||
obj.busy = false;
|
||||
|
||||
return ret;
|
||||
|
|
@ -698,7 +699,7 @@ static int add_group_and_track_objects(struct mpl_mediaplayer *pl)
|
|||
static int on_obj_deleted(struct bt_ots *ots, struct bt_conn *conn,
|
||||
uint64_t id)
|
||||
{
|
||||
BT_DBG_OBJ_ID("Object Id deleted: ", id);
|
||||
LOG_DBG_OBJ_ID("Object Id deleted: ", id);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -709,38 +710,38 @@ static void on_obj_selected(struct bt_ots *ots, struct bt_conn *conn,
|
|||
if (obj.busy) {
|
||||
/* TODO: Can there be a collision between select and internal */
|
||||
/* activities, like adding new objects? */
|
||||
BT_ERR("Object busy - select not performed");
|
||||
LOG_ERR("Object busy - select not performed");
|
||||
return;
|
||||
}
|
||||
obj.busy = true;
|
||||
|
||||
BT_DBG_OBJ_ID("Object Id selected: ", id);
|
||||
LOG_DBG_OBJ_ID("Object Id selected: ", id);
|
||||
|
||||
if (id == pl.icon_id) {
|
||||
BT_DBG("Icon Object ID");
|
||||
LOG_DBG("Icon Object ID");
|
||||
(void)setup_icon_object();
|
||||
} else if (id == pl.group->track->segments_id) {
|
||||
BT_DBG("Current Track Segments Object ID");
|
||||
LOG_DBG("Current Track Segments Object ID");
|
||||
(void)setup_segments_object(pl.group->track);
|
||||
} else if (id == pl.group->track->id) {
|
||||
BT_DBG("Current Track Object ID");
|
||||
LOG_DBG("Current Track Object ID");
|
||||
(void)setup_track_object(pl.group->track);
|
||||
} else if (pl.next_track_set && id == pl.next.track->id) {
|
||||
/* Next track, if the next track has been explicitly set */
|
||||
BT_DBG("Next Track Object ID");
|
||||
LOG_DBG("Next Track Object ID");
|
||||
(void)setup_track_object(pl.next.track);
|
||||
} else if (id == pl.group->track->next->id) {
|
||||
/* Next track, if next track has not been explicitly set */
|
||||
BT_DBG("Next Track Object ID");
|
||||
LOG_DBG("Next Track Object ID");
|
||||
(void)setup_track_object(pl.group->track->next);
|
||||
} else if (id == pl.group->parent->id) {
|
||||
BT_DBG("Parent Group Object ID");
|
||||
LOG_DBG("Parent Group Object ID");
|
||||
(void)setup_parent_group_object(pl.group);
|
||||
} else if (id == pl.group->id) {
|
||||
BT_DBG("Current Group Object ID");
|
||||
LOG_DBG("Current Group Object ID");
|
||||
(void)setup_group_object(pl.group);
|
||||
} else {
|
||||
BT_ERR("Unknown Object ID");
|
||||
LOG_ERR("Unknown Object ID");
|
||||
obj.busy = false;
|
||||
return;
|
||||
}
|
||||
|
|
@ -753,58 +754,58 @@ static int on_obj_created(struct bt_ots *ots, struct bt_conn *conn, uint64_t id,
|
|||
const struct bt_ots_obj_add_param *add_param,
|
||||
struct bt_ots_obj_created_desc *created_desc)
|
||||
{
|
||||
BT_DBG_OBJ_ID("Object Id created: ", id);
|
||||
LOG_DBG_OBJ_ID("Object Id created: ", id);
|
||||
|
||||
*created_desc = *obj.desc;
|
||||
|
||||
if (!bt_uuid_cmp(&add_param->type.uuid, BT_UUID_OTS_TYPE_MPL_ICON)) {
|
||||
BT_DBG("Icon Obj Type");
|
||||
LOG_DBG("Icon Obj Type");
|
||||
if (obj.add_type == MPL_OBJ_ICON) {
|
||||
obj.add_type = MPL_OBJ_NONE;
|
||||
pl.icon_id = id;
|
||||
} else {
|
||||
BT_DBG("Unexpected object creation");
|
||||
LOG_DBG("Unexpected object creation");
|
||||
}
|
||||
|
||||
} else if (!bt_uuid_cmp(&add_param->type.uuid,
|
||||
BT_UUID_OTS_TYPE_TRACK_SEGMENT)) {
|
||||
BT_DBG("Track Segments Obj Type");
|
||||
LOG_DBG("Track Segments Obj Type");
|
||||
if (obj.add_type == MPL_OBJ_TRACK_SEGMENTS) {
|
||||
obj.add_type = MPL_OBJ_NONE;
|
||||
pl.group->track->segments_id = id;
|
||||
} else {
|
||||
BT_DBG("Unexpected object creation");
|
||||
LOG_DBG("Unexpected object creation");
|
||||
}
|
||||
|
||||
} else if (!bt_uuid_cmp(&add_param->type.uuid,
|
||||
BT_UUID_OTS_TYPE_TRACK)) {
|
||||
BT_DBG("Track Obj Type");
|
||||
LOG_DBG("Track Obj Type");
|
||||
if (obj.add_type == MPL_OBJ_TRACK) {
|
||||
obj.add_type = MPL_OBJ_NONE;
|
||||
obj.add_track->id = id;
|
||||
obj.add_track = NULL;
|
||||
} else {
|
||||
BT_DBG("Unexpected object creation");
|
||||
LOG_DBG("Unexpected object creation");
|
||||
}
|
||||
|
||||
} else if (!bt_uuid_cmp(&add_param->type.uuid,
|
||||
BT_UUID_OTS_TYPE_GROUP)) {
|
||||
BT_DBG("Group Obj Type");
|
||||
LOG_DBG("Group Obj Type");
|
||||
if (obj.add_type == MPL_OBJ_PARENT_GROUP) {
|
||||
BT_DBG("Parent group");
|
||||
LOG_DBG("Parent group");
|
||||
obj.add_type = MPL_OBJ_NONE;
|
||||
pl.group->parent->id = id;
|
||||
} else if (obj.add_type == MPL_OBJ_GROUP) {
|
||||
BT_DBG("Other group");
|
||||
LOG_DBG("Other group");
|
||||
obj.add_type = MPL_OBJ_NONE;
|
||||
obj.add_group->id = id;
|
||||
obj.add_group = NULL;
|
||||
} else {
|
||||
BT_DBG("Unexpected object creation");
|
||||
LOG_DBG("Unexpected object creation");
|
||||
}
|
||||
|
||||
} else {
|
||||
BT_DBG("Unknown Object ID");
|
||||
LOG_DBG("Unknown Object ID");
|
||||
}
|
||||
|
||||
if (obj.add_type == MPL_OBJ_NONE) {
|
||||
|
|
@ -821,39 +822,38 @@ static ssize_t on_object_send(struct bt_ots *ots, struct bt_conn *conn,
|
|||
if (obj.busy) {
|
||||
/* TODO: Can there be a collision between select and internal */
|
||||
/* activities, like adding new objects? */
|
||||
BT_ERR("Object busy");
|
||||
LOG_ERR("Object busy");
|
||||
return 0;
|
||||
}
|
||||
obj.busy = true;
|
||||
|
||||
if (IS_ENABLED(CONFIG_BT_DEBUG_MPL)) {
|
||||
if (IS_ENABLED(CONFIG_BT_MPL_LOG_LEVEL_DBG)) {
|
||||
char t[BT_OTS_OBJ_ID_STR_LEN];
|
||||
(void)bt_ots_obj_id_to_str(id, t, sizeof(t));
|
||||
BT_DBG("Object Id %s, offset %lu, length %zu", t,
|
||||
(long)offset, len);
|
||||
LOG_DBG("Object Id %s, offset %lu, length %zu", t, (long)offset, len);
|
||||
}
|
||||
|
||||
if (id != obj.selected_id) {
|
||||
BT_ERR("Read from unselected object");
|
||||
LOG_ERR("Read from unselected object");
|
||||
obj.busy = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!data) {
|
||||
BT_DBG("Read complete");
|
||||
LOG_DBG("Read complete");
|
||||
obj.busy = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (offset >= obj.content->len) {
|
||||
BT_DBG("Offset too large");
|
||||
LOG_DBG("Offset too large");
|
||||
obj.busy = false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (IS_ENABLED(CONFIG_BT_DEBUG_MPL)) {
|
||||
if (IS_ENABLED(CONFIG_BT_MPL_LOG_LEVEL_DBG)) {
|
||||
if (len > obj.content->len - offset) {
|
||||
BT_DBG("Requested len too large");
|
||||
LOG_DBG("Requested len too large");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -878,62 +878,53 @@ static struct bt_ots_cb ots_cbs = {
|
|||
|
||||
void do_prev_segment(struct mpl_mediaplayer *pl)
|
||||
{
|
||||
BT_DBG("Segment name before: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name before: %s", pl->group->track->segment->name);
|
||||
|
||||
if (pl->group->track->segment->prev != NULL) {
|
||||
pl->group->track->segment = pl->group->track->segment->prev;
|
||||
}
|
||||
|
||||
BT_DBG("Segment name after: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name after: %s", pl->group->track->segment->name);
|
||||
}
|
||||
|
||||
void do_next_segment(struct mpl_mediaplayer *pl)
|
||||
{
|
||||
BT_DBG("Segment name before: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name before: %s", pl->group->track->segment->name);
|
||||
|
||||
if (pl->group->track->segment->next != NULL) {
|
||||
pl->group->track->segment = pl->group->track->segment->next;
|
||||
}
|
||||
|
||||
BT_DBG("Segment name after: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name after: %s", pl->group->track->segment->name);
|
||||
}
|
||||
|
||||
void do_first_segment(struct mpl_mediaplayer *pl)
|
||||
{
|
||||
BT_DBG("Segment name before: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name before: %s", pl->group->track->segment->name);
|
||||
|
||||
while (pl->group->track->segment->prev != NULL) {
|
||||
pl->group->track->segment = pl->group->track->segment->prev;
|
||||
}
|
||||
|
||||
BT_DBG("Segment name after: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name after: %s", pl->group->track->segment->name);
|
||||
}
|
||||
|
||||
void do_last_segment(struct mpl_mediaplayer *pl)
|
||||
{
|
||||
BT_DBG("Segment name before: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name before: %s", pl->group->track->segment->name);
|
||||
|
||||
while (pl->group->track->segment->next != NULL) {
|
||||
pl->group->track->segment = pl->group->track->segment->next;
|
||||
}
|
||||
|
||||
BT_DBG("Segment name after: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name after: %s", pl->group->track->segment->name);
|
||||
}
|
||||
|
||||
void do_goto_segment(struct mpl_mediaplayer *pl, int32_t segnum)
|
||||
{
|
||||
int32_t k;
|
||||
|
||||
BT_DBG("Segment name before: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name before: %s", pl->group->track->segment->name);
|
||||
|
||||
if (segnum > 0) {
|
||||
/* Goto first segment */
|
||||
|
|
@ -965,8 +956,7 @@ void do_goto_segment(struct mpl_mediaplayer *pl, int32_t segnum)
|
|||
}
|
||||
}
|
||||
|
||||
BT_DBG("Segment name after: %s",
|
||||
pl->group->track->segment->name);
|
||||
LOG_DBG("Segment name after: %s", pl->group->track->segment->name);
|
||||
}
|
||||
|
||||
static bool do_prev_track(struct mpl_mediaplayer *pl)
|
||||
|
|
@ -974,7 +964,7 @@ static bool do_prev_track(struct mpl_mediaplayer *pl)
|
|||
bool track_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->track->prev != NULL) {
|
||||
|
|
@ -983,7 +973,7 @@ static bool do_prev_track(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return track_changed;
|
||||
|
|
@ -995,7 +985,7 @@ static bool do_next_track_normal_order(struct mpl_mediaplayer *pl)
|
|||
bool track_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->track->next != NULL) {
|
||||
|
|
@ -1004,7 +994,7 @@ static bool do_next_track_normal_order(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return track_changed;
|
||||
|
|
@ -1040,7 +1030,7 @@ static bool do_first_track(struct mpl_mediaplayer *pl)
|
|||
bool track_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->track->prev != NULL) {
|
||||
|
|
@ -1052,7 +1042,7 @@ static bool do_first_track(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return track_changed;
|
||||
|
|
@ -1063,7 +1053,7 @@ static bool do_last_track(struct mpl_mediaplayer *pl)
|
|||
bool track_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->track->next != NULL) {
|
||||
|
|
@ -1075,7 +1065,7 @@ static bool do_last_track(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return track_changed;
|
||||
|
|
@ -1087,7 +1077,7 @@ static bool do_goto_track(struct mpl_mediaplayer *pl, int32_t tracknum)
|
|||
int32_t k;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID before: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (tracknum > 0) {
|
||||
|
|
@ -1121,7 +1111,7 @@ static bool do_goto_track(struct mpl_mediaplayer *pl, int32_t tracknum)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
LOG_DBG_OBJ_ID("Track ID after: ", pl->group->track->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
/* The track has changed if we have moved more in one direction */
|
||||
|
|
@ -1135,7 +1125,7 @@ static bool do_prev_group(struct mpl_mediaplayer *pl)
|
|||
bool group_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->prev != NULL) {
|
||||
|
|
@ -1144,7 +1134,7 @@ static bool do_prev_group(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return group_changed;
|
||||
|
|
@ -1155,7 +1145,7 @@ static bool do_next_group(struct mpl_mediaplayer *pl)
|
|||
bool group_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->next != NULL) {
|
||||
|
|
@ -1164,7 +1154,7 @@ static bool do_next_group(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return group_changed;
|
||||
|
|
@ -1175,7 +1165,7 @@ static bool do_first_group(struct mpl_mediaplayer *pl)
|
|||
bool group_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->prev != NULL) {
|
||||
|
|
@ -1187,7 +1177,7 @@ static bool do_first_group(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return group_changed;
|
||||
|
|
@ -1198,7 +1188,7 @@ static bool do_last_group(struct mpl_mediaplayer *pl)
|
|||
bool group_changed = false;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (pl->group->next != NULL) {
|
||||
|
|
@ -1210,7 +1200,7 @@ static bool do_last_group(struct mpl_mediaplayer *pl)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
return group_changed;
|
||||
|
|
@ -1222,7 +1212,7 @@ static bool do_goto_group(struct mpl_mediaplayer *pl, int32_t groupnum)
|
|||
int32_t k;
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID before: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
if (groupnum > 0) {
|
||||
|
|
@ -1256,7 +1246,7 @@ static bool do_goto_group(struct mpl_mediaplayer *pl, int32_t groupnum)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_BT_MPL_OBJECTS
|
||||
BT_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
LOG_DBG_OBJ_ID("Group ID after: ", pl->group->id);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
/* The group has changed if we have moved more in one direction */
|
||||
|
|
@ -1407,10 +1397,10 @@ void do_full_goto_group(struct mpl_mediaplayer *pl, int32_t groupnum)
|
|||
void inactive_state_command_handler(const struct mpl_cmd *command,
|
||||
struct mpl_cmd_ntf *ntf)
|
||||
{
|
||||
BT_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_DEBUG_MPL)) {
|
||||
LOG_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_MPL_LOG_LEVEL_DBG)) {
|
||||
if (command->use_param) {
|
||||
BT_DBG("Command parameter: %d", command->param);
|
||||
LOG_DBG("Command parameter: %d", command->param);
|
||||
}
|
||||
}
|
||||
switch (command->opcode) {
|
||||
|
|
@ -1450,7 +1440,7 @@ void inactive_state_command_handler(const struct mpl_cmd *command,
|
|||
* with the "next" order hardcoded into the group and track structure
|
||||
*/
|
||||
if (pl.next_track_set) {
|
||||
BT_DBG("Next track set");
|
||||
LOG_DBG("Next track set");
|
||||
if (do_next_track_next_track_set(&pl)) {
|
||||
do_group_change_notifications(&pl);
|
||||
}
|
||||
|
|
@ -1557,7 +1547,7 @@ void inactive_state_command_handler(const struct mpl_cmd *command,
|
|||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
default:
|
||||
BT_DBG("Invalid command: %d", command->opcode);
|
||||
LOG_DBG("Invalid command: %d", command->opcode);
|
||||
ntf->result_code = MEDIA_PROXY_CMD_NOT_SUPPORTED;
|
||||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
|
|
@ -1567,10 +1557,10 @@ void inactive_state_command_handler(const struct mpl_cmd *command,
|
|||
void playing_state_command_handler(const struct mpl_cmd *command,
|
||||
struct mpl_cmd_ntf *ntf)
|
||||
{
|
||||
BT_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_DEBUG_MPL)) {
|
||||
LOG_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_MPL_LOG_LEVEL_DBG)) {
|
||||
if (command->use_param) {
|
||||
BT_DBG("Command parameter: %d", command->param);
|
||||
LOG_DBG("Command parameter: %d", command->param);
|
||||
}
|
||||
}
|
||||
switch (command->opcode) {
|
||||
|
|
@ -1694,7 +1684,7 @@ void playing_state_command_handler(const struct mpl_cmd *command,
|
|||
break;
|
||||
case MEDIA_PROXY_OP_NEXT_TRACK:
|
||||
if (pl.next_track_set) {
|
||||
BT_DBG("Next track set");
|
||||
LOG_DBG("Next track set");
|
||||
if (do_next_track_next_track_set(&pl)) {
|
||||
do_group_change_notifications(&pl);
|
||||
}
|
||||
|
|
@ -1783,7 +1773,7 @@ void playing_state_command_handler(const struct mpl_cmd *command,
|
|||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
default:
|
||||
BT_DBG("Invalid command: %d", command->opcode);
|
||||
LOG_DBG("Invalid command: %d", command->opcode);
|
||||
ntf->result_code = MEDIA_PROXY_CMD_NOT_SUPPORTED;
|
||||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
|
|
@ -1793,10 +1783,10 @@ void playing_state_command_handler(const struct mpl_cmd *command,
|
|||
void paused_state_command_handler(const struct mpl_cmd *command,
|
||||
struct mpl_cmd_ntf *ntf)
|
||||
{
|
||||
BT_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_DEBUG_MPL)) {
|
||||
LOG_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_MPL_LOG_LEVEL_DBG)) {
|
||||
if (command->use_param) {
|
||||
BT_DBG("Command parameter: %d", command->param);
|
||||
LOG_DBG("Command parameter: %d", command->param);
|
||||
}
|
||||
}
|
||||
switch (command->opcode) {
|
||||
|
|
@ -1920,7 +1910,7 @@ void paused_state_command_handler(const struct mpl_cmd *command,
|
|||
break;
|
||||
case MEDIA_PROXY_OP_NEXT_TRACK:
|
||||
if (pl.next_track_set) {
|
||||
BT_DBG("Next track set");
|
||||
LOG_DBG("Next track set");
|
||||
if (do_next_track_next_track_set(&pl)) {
|
||||
do_group_change_notifications(&pl);
|
||||
}
|
||||
|
|
@ -2009,7 +1999,7 @@ void paused_state_command_handler(const struct mpl_cmd *command,
|
|||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
default:
|
||||
BT_DBG("Invalid command: %d", command->opcode);
|
||||
LOG_DBG("Invalid command: %d", command->opcode);
|
||||
ntf->result_code = MEDIA_PROXY_CMD_NOT_SUPPORTED;
|
||||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
|
|
@ -2019,10 +2009,10 @@ void paused_state_command_handler(const struct mpl_cmd *command,
|
|||
void seeking_state_command_handler(const struct mpl_cmd *command,
|
||||
struct mpl_cmd_ntf *ntf)
|
||||
{
|
||||
BT_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_DEBUG_MPL)) {
|
||||
LOG_DBG("Command opcode: %d", command->opcode);
|
||||
if (IS_ENABLED(CONFIG_BT_MPL_LOG_LEVEL_DBG)) {
|
||||
if (command->use_param) {
|
||||
BT_DBG("Command parameter: %d", command->param);
|
||||
LOG_DBG("Command parameter: %d", command->param);
|
||||
}
|
||||
}
|
||||
switch (command->opcode) {
|
||||
|
|
@ -2164,7 +2154,7 @@ void seeking_state_command_handler(const struct mpl_cmd *command,
|
|||
break;
|
||||
case MEDIA_PROXY_OP_NEXT_TRACK:
|
||||
if (pl.next_track_set) {
|
||||
BT_DBG("Next track set");
|
||||
LOG_DBG("Next track set");
|
||||
if (do_next_track_next_track_set(&pl)) {
|
||||
do_group_change_notifications(&pl);
|
||||
}
|
||||
|
|
@ -2275,7 +2265,7 @@ void seeking_state_command_handler(const struct mpl_cmd *command,
|
|||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
default:
|
||||
BT_DBG("Invalid command: %d", command->opcode);
|
||||
LOG_DBG("Invalid command: %d", command->opcode);
|
||||
ntf->result_code = MEDIA_PROXY_CMD_NOT_SUPPORTED;
|
||||
media_proxy_pl_command_cb(ntf);
|
||||
break;
|
||||
|
|
@ -2421,8 +2411,8 @@ void set_track_position(int32_t position)
|
|||
}
|
||||
}
|
||||
|
||||
BT_DBG("Pos. given: %d, resulting pos.: %d (duration is %d)",
|
||||
position, new_pos, pl.group->track->duration);
|
||||
LOG_DBG("Pos. given: %d, resulting pos.: %d (duration is %d)", position, new_pos,
|
||||
pl.group->track->duration);
|
||||
|
||||
if (new_pos != old_pos) {
|
||||
/* Set new position and notify it */
|
||||
|
|
@ -2466,7 +2456,7 @@ void set_current_track_id(uint64_t id)
|
|||
struct mpl_group *group;
|
||||
struct mpl_track *track;
|
||||
|
||||
BT_DBG_OBJ_ID("Track ID to set: ", id);
|
||||
LOG_DBG_OBJ_ID("Track ID to set: ", id);
|
||||
|
||||
if (find_track_by_id(&pl, id, &group, &track)) {
|
||||
|
||||
|
|
@ -2485,7 +2475,7 @@ void set_current_track_id(uint64_t id)
|
|||
return;
|
||||
}
|
||||
|
||||
BT_DBG("Track not found");
|
||||
LOG_DBG("Track not found");
|
||||
|
||||
/* TODO: Should an error be returned here?
|
||||
* That would require a rewrite of the MPL api to add return values to the functions.
|
||||
|
|
@ -2513,7 +2503,7 @@ void set_next_track_id(uint64_t id)
|
|||
struct mpl_group *group;
|
||||
struct mpl_track *track;
|
||||
|
||||
BT_DBG_OBJ_ID("Next Track ID to set: ", id);
|
||||
LOG_DBG_OBJ_ID("Next Track ID to set: ", id);
|
||||
|
||||
if (find_track_by_id(&pl, id, &group, &track)) {
|
||||
|
||||
|
|
@ -2524,7 +2514,7 @@ void set_next_track_id(uint64_t id)
|
|||
return;
|
||||
}
|
||||
|
||||
BT_DBG("Track not found");
|
||||
LOG_DBG("Track not found");
|
||||
}
|
||||
|
||||
uint64_t get_parent_group_id(void)
|
||||
|
|
@ -2542,7 +2532,7 @@ void set_current_group_id(uint64_t id)
|
|||
struct mpl_group *group;
|
||||
bool track_change;
|
||||
|
||||
BT_DBG_OBJ_ID("Group ID to set: ", id);
|
||||
LOG_DBG_OBJ_ID("Group ID to set: ", id);
|
||||
|
||||
if (find_group_by_id(&pl, id, &group)) {
|
||||
|
||||
|
|
@ -2560,7 +2550,7 @@ void set_current_group_id(uint64_t id)
|
|||
return;
|
||||
}
|
||||
|
||||
BT_DBG("Group not found");
|
||||
LOG_DBG("Group not found");
|
||||
}
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
|
|
@ -2594,16 +2584,16 @@ void send_command(const struct mpl_cmd *command)
|
|||
struct mpl_cmd_ntf ntf;
|
||||
|
||||
if (command->use_param) {
|
||||
BT_DBG("opcode: %d, param: %d", command->opcode, command->param);
|
||||
LOG_DBG("opcode: %d, param: %d", command->opcode, command->param);
|
||||
} else {
|
||||
BT_DBG("opcode: %d", command->opcode);
|
||||
LOG_DBG("opcode: %d", command->opcode);
|
||||
}
|
||||
|
||||
if (pl.state < MEDIA_PROXY_STATE_LAST) {
|
||||
ntf.requested_opcode = command->opcode;
|
||||
command_handlers[pl.state](command, &ntf);
|
||||
} else {
|
||||
BT_DBG("INVALID STATE");
|
||||
LOG_DBG("INVALID STATE");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2621,20 +2611,20 @@ static void parse_search(const struct mpl_search *search)
|
|||
bool search_failed = false;
|
||||
|
||||
if (search->len > SEARCH_LEN_MAX) {
|
||||
BT_WARN("Search too long (%d) - aborting", search->len);
|
||||
LOG_WRN("Search too long (%d) - aborting", search->len);
|
||||
search_failed = true;
|
||||
} else {
|
||||
BT_DBG("Parsing %d octets search", search->len);
|
||||
LOG_DBG("Parsing %d octets search", search->len);
|
||||
|
||||
while (search->len - index > 0) {
|
||||
sci.len = (uint8_t)search->search[index++];
|
||||
if (sci.len < SEARCH_SCI_LEN_MIN) {
|
||||
BT_WARN("Invalid length field - too small");
|
||||
LOG_WRN("Invalid length field - too small");
|
||||
search_failed = true;
|
||||
break;
|
||||
}
|
||||
if (sci.len > (search->len - index)) {
|
||||
BT_WARN("Incomplete search control item");
|
||||
LOG_WRN("Incomplete search control item");
|
||||
search_failed = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -2647,7 +2637,7 @@ static void parse_search(const struct mpl_search *search)
|
|||
(void)memcpy(&sci.param, &search->search[index], sci.len - 1);
|
||||
index += sci.len - 1;
|
||||
|
||||
BT_DBG("SCI # %d: type: %d", sci_num, sci.type);
|
||||
LOG_DBG("SCI # %d: type: %d", sci_num, sci.type);
|
||||
LOG_HEXDUMP_DBG(sci.param, sci.len - 1, "param:");
|
||||
sci_num++;
|
||||
}
|
||||
|
|
@ -2671,7 +2661,7 @@ static void parse_search(const struct mpl_search *search)
|
|||
void send_search(const struct mpl_search *search)
|
||||
{
|
||||
if (search->len > SEARCH_LEN_MAX) {
|
||||
BT_WARN("Search too long: %d", search->len);
|
||||
LOG_WRN("Search too long: %d", search->len);
|
||||
}
|
||||
|
||||
LOG_HEXDUMP_DBG(search->search, search->len, "Search");
|
||||
|
|
@ -2696,7 +2686,7 @@ int media_proxy_pl_init(void)
|
|||
int ret;
|
||||
|
||||
if (initialized) {
|
||||
BT_DBG("Already initialized");
|
||||
LOG_DBG("Already initialized");
|
||||
return -EALREADY;
|
||||
}
|
||||
|
||||
|
|
@ -2712,11 +2702,11 @@ int media_proxy_pl_init(void)
|
|||
ret = bt_mcs_init(NULL);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
if (ret < 0) {
|
||||
BT_ERR("Could not init MCS: %d", ret);
|
||||
LOG_ERR("Could not init MCS: %d", ret);
|
||||
return ret;
|
||||
}
|
||||
#else
|
||||
BT_WARN("MCS not configured");
|
||||
LOG_WRN("MCS not configured");
|
||||
#endif /* CONFIG_BT_MCS */
|
||||
|
||||
/* Get a Content Control ID */
|
||||
|
|
@ -2729,14 +2719,14 @@ int media_proxy_pl_init(void)
|
|||
/* Icon Object */
|
||||
ret = add_icon_object(&pl);
|
||||
if (ret < 0) {
|
||||
BT_ERR("Unable to add icon object, error %d", ret);
|
||||
LOG_ERR("Unable to add icon object, error %d", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Add all tracks and groups to OTS */
|
||||
ret = add_group_and_track_objects(&pl);
|
||||
if (ret < 0) {
|
||||
BT_ERR("Error adding tracks and groups to OTS, error %d", ret);
|
||||
LOG_ERR("Error adding tracks and groups to OTS, error %d", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -2745,7 +2735,7 @@ int media_proxy_pl_init(void)
|
|||
/* but for no only one of the tracks has segments .*/
|
||||
ret = add_current_track_segments_object(&pl);
|
||||
if (ret < 0) {
|
||||
BT_ERR("Error adding Track Segments Object to OTS, error %d", ret);
|
||||
LOG_ERR("Error adding Track Segments Object to OTS, error %d", ret);
|
||||
return ret;
|
||||
}
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
|
@ -2787,7 +2777,7 @@ int media_proxy_pl_init(void)
|
|||
|
||||
ret = media_proxy_pl_register(&pl.calls);
|
||||
if (ret < 0) {
|
||||
BT_ERR("Unable to register player");
|
||||
LOG_ERR("Unable to register player");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -2795,7 +2785,7 @@ int media_proxy_pl_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if CONFIG_BT_DEBUG_MPL /* Special commands for debugging */
|
||||
#if CONFIG_BT_MPL_LOG_LEVEL_DBG /* Special commands for debugging */
|
||||
|
||||
void mpl_debug_dump_state(void)
|
||||
{
|
||||
|
|
@ -2805,52 +2795,52 @@ void mpl_debug_dump_state(void)
|
|||
struct mpl_track *track;
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
BT_DBG("Mediaplayer name: %s", pl.name);
|
||||
LOG_DBG("Mediaplayer name: %s", pl.name);
|
||||
|
||||
#if CONFIG_BT_MPL_OBJECTS
|
||||
(void)bt_ots_obj_id_to_str(pl.icon_id, t, sizeof(t));
|
||||
BT_DBG("Icon ID: %s", t);
|
||||
LOG_DBG("Icon ID: %s", t);
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
BT_DBG("Icon URL: %s", pl.icon_url);
|
||||
BT_DBG("Track position: %d", pl.track_pos);
|
||||
BT_DBG("Media state: %d", pl.state);
|
||||
BT_DBG("Playback speed parameter: %d", pl.playback_speed_param);
|
||||
BT_DBG("Seeking speed factor: %d", pl.seeking_speed_factor);
|
||||
BT_DBG("Playing order: %d", pl.playing_order);
|
||||
BT_DBG("Playing orders supported: 0x%x", pl.playing_orders_supported);
|
||||
BT_DBG("Opcodes supported: %d", pl.opcodes_supported);
|
||||
BT_DBG("Content control ID: %d", pl.content_ctrl_id);
|
||||
LOG_DBG("Icon URL: %s", pl.icon_url);
|
||||
LOG_DBG("Track position: %d", pl.track_pos);
|
||||
LOG_DBG("Media state: %d", pl.state);
|
||||
LOG_DBG("Playback speed parameter: %d", pl.playback_speed_param);
|
||||
LOG_DBG("Seeking speed factor: %d", pl.seeking_speed_factor);
|
||||
LOG_DBG("Playing order: %d", pl.playing_order);
|
||||
LOG_DBG("Playing orders supported: 0x%x", pl.playing_orders_supported);
|
||||
LOG_DBG("Opcodes supported: %d", pl.opcodes_supported);
|
||||
LOG_DBG("Content control ID: %d", pl.content_ctrl_id);
|
||||
|
||||
#if CONFIG_BT_MPL_OBJECTS
|
||||
(void)bt_ots_obj_id_to_str(pl.group->parent->id, t, sizeof(t));
|
||||
BT_DBG("Current group's parent: %s", t);
|
||||
LOG_DBG("Current group's parent: %s", t);
|
||||
|
||||
(void)bt_ots_obj_id_to_str(pl.group->id, t, sizeof(t));
|
||||
BT_DBG("Current group: %s", t);
|
||||
LOG_DBG("Current group: %s", t);
|
||||
|
||||
(void)bt_ots_obj_id_to_str(pl.group->track->id, t, sizeof(t));
|
||||
BT_DBG("Current track: %s", t);
|
||||
LOG_DBG("Current track: %s", t);
|
||||
|
||||
if (pl.next_track_set) {
|
||||
(void)bt_ots_obj_id_to_str(pl.next.track->id, t, sizeof(t));
|
||||
BT_DBG("Next track: %s", t);
|
||||
LOG_DBG("Next track: %s", t);
|
||||
} else if (pl.group->track->next) {
|
||||
(void)bt_ots_obj_id_to_str(pl.group->track->next->id, t,
|
||||
sizeof(t));
|
||||
BT_DBG("Next track: %s", t);
|
||||
LOG_DBG("Next track: %s", t);
|
||||
} else {
|
||||
BT_DBG("No next track");
|
||||
LOG_DBG("No next track");
|
||||
}
|
||||
|
||||
if (pl.search_results_id) {
|
||||
(void)bt_ots_obj_id_to_str(pl.search_results_id, t, sizeof(t));
|
||||
BT_DBG("Search results: %s", t);
|
||||
LOG_DBG("Search results: %s", t);
|
||||
} else {
|
||||
BT_DBG("No search results");
|
||||
LOG_DBG("No search results");
|
||||
}
|
||||
|
||||
BT_DBG("Groups and tracks:");
|
||||
LOG_DBG("Groups and tracks:");
|
||||
group = pl.group;
|
||||
|
||||
while (group->prev != NULL) {
|
||||
|
|
@ -2859,12 +2849,10 @@ void mpl_debug_dump_state(void)
|
|||
|
||||
while (group) {
|
||||
(void)bt_ots_obj_id_to_str(group->id, t, sizeof(t));
|
||||
BT_DBG("Group: %s, %s", t,
|
||||
group->title);
|
||||
LOG_DBG("Group: %s, %s", t, group->title);
|
||||
|
||||
(void)bt_ots_obj_id_to_str(group->parent->id, t, sizeof(t));
|
||||
BT_DBG("\tParent: %s, %s", t,
|
||||
group->parent->title);
|
||||
LOG_DBG("\tParent: %s, %s", t, group->parent->title);
|
||||
|
||||
track = group->track;
|
||||
while (track->prev != NULL) {
|
||||
|
|
@ -2873,8 +2861,7 @@ void mpl_debug_dump_state(void)
|
|||
|
||||
while (track) {
|
||||
(void)bt_ots_obj_id_to_str(track->id, t, sizeof(t));
|
||||
BT_DBG("\tTrack: %s, %s, duration: %d", t,
|
||||
track->title, track->duration);
|
||||
LOG_DBG("\tTrack: %s, %s, duration: %d", t, track->title, track->duration);
|
||||
track = track->next;
|
||||
}
|
||||
|
||||
|
|
@ -2882,15 +2869,15 @@ void mpl_debug_dump_state(void)
|
|||
}
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
}
|
||||
#endif /* CONFIG_BT_DEBUG_MPL */
|
||||
#endif /* CONFIG_BT_MPL_LOG_LEVEL_DBG */
|
||||
|
||||
|
||||
#if defined(CONFIG_BT_DEBUG_MPL) && defined(CONFIG_BT_TESTING) /* Special commands for testing */
|
||||
#if defined(CONFIG_BT_MPL_LOG_LEVEL_DBG) && \
|
||||
defined(CONFIG_BT_TESTING) /* Special commands for testing */
|
||||
|
||||
#if CONFIG_BT_MPL_OBJECTS
|
||||
void mpl_test_unset_parent_group(void)
|
||||
{
|
||||
BT_DBG("Setting current group to be it's own parent");
|
||||
LOG_DBG("Setting current group to be it's own parent");
|
||||
pl.group->parent = pl.group;
|
||||
}
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
|
@ -2975,4 +2962,4 @@ void mpl_test_search_results_changed_cb(void)
|
|||
}
|
||||
#endif /* CONFIG_BT_MPL_OBJECTS */
|
||||
|
||||
#endif /* CONFIG_BT_DEBUG_MPL && CONFIG_BT_TESTING */
|
||||
#endif /* CONFIG_BT_MPL_LOG_LEVEL_DBG && CONFIG_BT_TESTING */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue