mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/revert_changes_a2dp_sink_example_v5.1' into 'release/v5.1'
Revert "fix(bt/bluedroid): corrected the strings of A2DP audio states" (v5.1) See merge request espressif/esp-idf!28363
This commit is contained in:
commit
01f6a7a5c7
@ -79,7 +79,7 @@ static esp_a2d_audio_state_t s_audio_state = ESP_A2D_AUDIO_STATE_STOPPED;
|
|||||||
/* audio stream datapath state */
|
/* audio stream datapath state */
|
||||||
static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Connected", "Disconnecting"};
|
static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Connected", "Disconnecting"};
|
||||||
/* connection state in string */
|
/* connection state in string */
|
||||||
static const char *s_a2d_audio_state_str[] = {"Suspended", "Started"};
|
static const char *s_a2d_audio_state_str[] = {"Suspended", "Stopped", "Started"};
|
||||||
/* audio stream datapath state in string */
|
/* audio stream datapath state in string */
|
||||||
static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap;
|
static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap;
|
||||||
/* AVRC target notification capability bit mask */
|
/* AVRC target notification capability bit mask */
|
||||||
|
@ -79,7 +79,7 @@ static esp_a2d_audio_state_t s_audio_state = ESP_A2D_AUDIO_STATE_STOPPED;
|
|||||||
/* audio stream datapath state */
|
/* audio stream datapath state */
|
||||||
static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Connected", "Disconnecting"};
|
static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Connected", "Disconnecting"};
|
||||||
/* connection state in string */
|
/* connection state in string */
|
||||||
static const char *s_a2d_audio_state_str[] = {"Suspended", "Started"};
|
static const char *s_a2d_audio_state_str[] = {"Suspended", "Stopped", "Started"};
|
||||||
/* audio stream datapath state in string */
|
/* audio stream datapath state in string */
|
||||||
static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap;
|
static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap;
|
||||||
/* AVRC target notification capability bit mask */
|
/* AVRC target notification capability bit mask */
|
||||||
|
Loading…
Reference in New Issue
Block a user