Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-07 03:57:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

completed BT/AirPlay display

Browse Source
This commit is contained in:
philippe44
2020-01-27 21:50:46 -08:00
parent 4857ec39db
commit f9c30733e0
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/driver_bt/bt_app_sink.c
View File

@@ -169,7 +169,7 @@ static bool cmd_handler(bt_sink_cmd_t cmd, ...) {
break;
}
case BT_SINK_PROGRESS: {
uint32_t elapsed = va_arg(args, uint32_t), duration = va_arg(args, uint32_t);
int elapsed = va_arg(args, int), duration = va_arg(args, int);
displayer_timer(DISPLAYER_ELAPSED, elapsed, duration);
chain = false;
break;
@@ -317,7 +317,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
static void bt_av_new_track(void)
{
// request metadata
uint8_t attr_mask = ESP_AVRC_MD_ATTR_TITLE | ESP_AVRC_MD_ATTR_ARTIST | ESP_AVRC_MD_ATTR_ALBUM;
uint8_t attr_mask = ESP_AVRC_MD_ATTR_TITLE | ESP_AVRC_MD_ATTR_ARTIST | ESP_AVRC_MD_ATTR_ALBUM | ESP_AVRC_MD_ATTR_PLAYING_TIME;
esp_avrc_ct_send_metadata_cmd(APP_RC_CT_TL_GET_META_DATA, attr_mask);
// register notification if peer support the event_id
@@ -357,6 +357,7 @@ void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_param
break;
case ESP_AVRC_RN_PLAY_POS_CHANGED:
ESP_LOGI(BT_AV_TAG, "Play position changed: %d-ms", event_parameter->play_pos);
(*bt_app_a2d_cmd_cb)(BT_SINK_PROGRESS, event_parameter->play_pos, -1);
bt_av_play_pos_changed();
break;
}
@@ -389,10 +390,11 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
char **p = NULL;
ESP_LOGI(BT_RC_CT_TAG, "AVRC metadata rsp: attribute id 0x%x, %s", rc->meta_rsp.attr_id, rc->meta_rsp.attr_text);
if (rc->meta_rsp.attr_id == 0x01) p = &s_title;
else if (rc->meta_rsp.attr_id == 0x02) p = &s_artist;
else if (rc->meta_rsp.attr_id == 0x04) p = &s_album;
if (rc->meta_rsp.attr_id == ESP_AVRC_MD_ATTR_TITLE) p = &s_title;
else if (rc->meta_rsp.attr_id == ESP_AVRC_MD_ATTR_ARTIST) p = &s_artist;
else if (rc->meta_rsp.attr_id == ESP_AVRC_MD_ATTR_ALBUM) p = &s_album;
else if (rc->meta_rsp.attr_id == ESP_AVRC_MD_ATTR_PLAYING_TIME) (*bt_app_a2d_cmd_cb)(BT_SINK_PROGRESS, -1, atoi((char*) rc->meta_rsp.attr_text));
// not very pretty, but this is bluetooth anyway
if (p) {
if (*p) free(*p);

3
components/raop/raop.c
View File

@@ -628,11 +628,12 @@ static bool handle_rtsp(raop_ctx_t *ctx, int sock)
if (body && (p = strcasestr(body, "volume")) != NULL) {
float volume;
sscanf(p, "%*[^:]:%f", &volume);
LOG_INFO("[%p]: SET PARAMETER volume %f", ctx, volume);
volume = (volume == -144.0) ? 0 : (1 + volume / 30);
success = ctx->cmd_cb(RAOP_VOLUME, volume);
} else if (body && (p = strcasestr(body, "progress")) != NULL) {
int start, current, stop = 0;
sscanf(p, "%*[^:]:%u/%u/%u", &start, &current, &stop);

2
components/raop/raop_sink.c
View File

@@ -108,7 +108,7 @@ static bool cmd_handler(raop_event_t event, ...) {
break;
}
case RAOP_PROGRESS: {
u32_t elapsed = va_arg(args, u32_t), duration = va_arg(args, u32_t);
int elapsed = va_arg(args, int), duration = va_arg(args, int);
displayer_timer(DISPLAYER_ELAPSED, elapsed, duration);
chain = false;
break;

6
components/services/display.c
View File

@@ -248,11 +248,11 @@ void displayer_scroll(char *string, int speed) {
/****************************************************************************************
*
*/
void displayer_timer(enum displayer_time_e mode, uint32_t elapsed, uint32_t duration) {
void displayer_timer(enum displayer_time_e mode, int elapsed, int duration) {
xSemaphoreTake(displayer.mutex, portMAX_DELAY);
displayer.elapsed = elapsed;
displayer.duration = duration;
if (elapsed >= 0) displayer.elapsed = elapsed;
if (duration >= 0) displayer.duration = duration;
displayer.timer = true;
displayer.tick = xTaskGetTickCount();

2
components/services/display.h
View File

@@ -55,4 +55,4 @@ extern struct display_s {
void displayer_scroll(char *string, int speed);
void displayer_control(enum displayer_cmd_e cmd, ...);
void displayer_metadata(char *artist, char *album, char *title);
void displayer_timer(enum displayer_time_e mode, uint32_t elapsed, uint32_t duration);
void displayer_timer(enum displayer_time_e mode, int elapsed, int duration);