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

fix audio control in bt and airplay

Browse Source
This commit is contained in:
Wizmo2
2021-06-16 21:53:44 -04:00
parent 38ec8ac6f8
commit e588deb3af
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver_bt/bt_app_sink.c
View File

@@ -133,12 +133,14 @@ static void bt_next(bool pressed) {
} }
const static actrls_t controls = { const static actrls_t controls = {
NULL, // power
bt_volume_up, bt_volume_down, // volume up, volume down bt_volume_up, bt_volume_down, // volume up, volume down
bt_toggle, bt_play, // toggle, play bt_toggle, bt_play, // toggle, play
bt_pause, bt_stop, // pause, stop bt_pause, bt_stop, // pause, stop
NULL, NULL, // rew, fwd NULL, NULL, // rew, fwd
bt_prev, bt_next, // prev, next bt_prev, bt_next, // prev, next
NULL, NULL, NULL, NULL, // left, right, up, down NULL, NULL, NULL, NULL, // left, right, up, down
NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6
bt_volume_down, bt_volume_up, bt_toggle// knob left, knob_right, knob push bt_volume_down, bt_volume_up, bt_toggle// knob left, knob_right, knob push
}; };

2
components/raop/raop_sink.c
View File

@@ -81,12 +81,14 @@ static void raop_next(bool pressed) {
} }
const static actrls_t controls = { const static actrls_t controls = {
NULL, // power
raop_volume_up, raop_volume_down, // volume up, volume down raop_volume_up, raop_volume_down, // volume up, volume down
raop_toggle, raop_play, // toggle, play raop_toggle, raop_play, // toggle, play
raop_pause, raop_stop, // pause, stop raop_pause, raop_stop, // pause, stop
NULL, NULL, // rew, fwd NULL, NULL, // rew, fwd
raop_prev, raop_next, // prev, next raop_prev, raop_next, // prev, next
NULL, NULL, NULL, NULL, // left, right, up, down NULL, NULL, NULL, NULL, // left, right, up, down
NULL, NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6
raop_volume_down, raop_volume_up, raop_toggle// knob left, knob_right, knob push raop_volume_down, raop_volume_up, raop_toggle// knob left, knob_right, knob push
}; };

1
components/services/audio_controls.c
View File

@@ -55,6 +55,7 @@ static const actrls_config_map_t actrls_config_map[] =
}; };
// BEWARE: the actions below need to stay aligned with the corresponding enum to properly support json parsing // BEWARE: the actions below need to stay aligned with the corresponding enum to properly support json parsing
// along with the actrls_t controls in LMS_controls, bt_sink and raop_sink
#define EP(x) [x] = #x /* ENUM PRINT */ #define EP(x) [x] = #x /* ENUM PRINT */
static const char * actrls_action_s[ ] = { EP(ACTRLS_POWER),EP(ACTRLS_VOLUP),EP(ACTRLS_VOLDOWN),EP(ACTRLS_TOGGLE),EP(ACTRLS_PLAY), static const char * actrls_action_s[ ] = { EP(ACTRLS_POWER),EP(ACTRLS_VOLUP),EP(ACTRLS_VOLDOWN),EP(ACTRLS_TOGGLE),EP(ACTRLS_PLAY),
EP(ACTRLS_PAUSE),EP(ACTRLS_STOP),EP(ACTRLS_REW),EP(ACTRLS_FWD),EP(ACTRLS_PREV),EP(ACTRLS_NEXT), EP(ACTRLS_PAUSE),EP(ACTRLS_STOP),EP(ACTRLS_REW),EP(ACTRLS_FWD),EP(ACTRLS_PREV),EP(ACTRLS_NEXT),