From e588deb3afcb3e0df30309daef5e6b6d27a7d495 Mon Sep 17 00:00:00 2001 From: Wizmo2 Date: Wed, 16 Jun 2021 21:53:44 -0400 Subject: [PATCH 1/3] fix audio control in bt and airplay --- components/driver_bt/bt_app_sink.c | 2 ++ components/raop/raop_sink.c | 2 ++ components/services/audio_controls.c | 1 + 3 files changed, 5 insertions(+) diff --git a/components/driver_bt/bt_app_sink.c b/components/driver_bt/bt_app_sink.c index bf91ea49..8ffc256e 100644 --- a/components/driver_bt/bt_app_sink.c +++ b/components/driver_bt/bt_app_sink.c @@ -133,12 +133,14 @@ static void bt_next(bool pressed) { } const static actrls_t controls = { + NULL, // power bt_volume_up, bt_volume_down, // volume up, volume down bt_toggle, bt_play, // toggle, play bt_pause, bt_stop, // pause, stop NULL, NULL, // rew, fwd bt_prev, bt_next, // prev, next 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 }; diff --git a/components/raop/raop_sink.c b/components/raop/raop_sink.c index bb39a42e..bf16e40a 100644 --- a/components/raop/raop_sink.c +++ b/components/raop/raop_sink.c @@ -81,12 +81,14 @@ static void raop_next(bool pressed) { } const static actrls_t controls = { + NULL, // power raop_volume_up, raop_volume_down, // volume up, volume down raop_toggle, raop_play, // toggle, play raop_pause, raop_stop, // pause, stop NULL, NULL, // rew, fwd raop_prev, raop_next, // prev, next 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 }; diff --git a/components/services/audio_controls.c b/components/services/audio_controls.c index a2c1bc66..00a0fdb0 100644 --- a/components/services/audio_controls.c +++ b/components/services/audio_controls.c @@ -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 +// along with the actrls_t controls in LMS_controls, bt_sink and raop_sink #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), EP(ACTRLS_PAUSE),EP(ACTRLS_STOP),EP(ACTRLS_REW),EP(ACTRLS_FWD),EP(ACTRLS_PREV),EP(ACTRLS_NEXT), From 8136b7fd9aa7a85b1401939f7782a0fab15ad539 Mon Sep 17 00:00:00 2001 From: wizmo2 Date: Thu, 17 Jun 2021 14:47:33 -0400 Subject: [PATCH 2/3] Fix indent --- components/driver_bt/bt_app_sink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/driver_bt/bt_app_sink.c b/components/driver_bt/bt_app_sink.c index 8ffc256e..a2397bc9 100644 --- a/components/driver_bt/bt_app_sink.c +++ b/components/driver_bt/bt_app_sink.c @@ -133,14 +133,14 @@ static void bt_next(bool pressed) { } const static actrls_t controls = { - NULL, // power + NULL, // power bt_volume_up, bt_volume_down, // volume up, volume down bt_toggle, bt_play, // toggle, play bt_pause, bt_stop, // pause, stop NULL, NULL, // rew, fwd bt_prev, bt_next, // prev, next NULL, NULL, NULL, NULL, // left, right, up, down - NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6 + NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6 bt_volume_down, bt_volume_up, bt_toggle// knob left, knob_right, knob push }; From 22f8d1d88bb6c46c69284448df2f08cd60e3c846 Mon Sep 17 00:00:00 2001 From: wizmo2 Date: Thu, 17 Jun 2021 14:48:58 -0400 Subject: [PATCH 3/3] Update bt_app_sink.c --- components/driver_bt/bt_app_sink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/driver_bt/bt_app_sink.c b/components/driver_bt/bt_app_sink.c index a2397bc9..ab058240 100644 --- a/components/driver_bt/bt_app_sink.c +++ b/components/driver_bt/bt_app_sink.c @@ -133,14 +133,14 @@ static void bt_next(bool pressed) { } const static actrls_t controls = { - NULL, // power + NULL, // power bt_volume_up, bt_volume_down, // volume up, volume down bt_toggle, bt_play, // toggle, play bt_pause, bt_stop, // pause, stop NULL, NULL, // rew, fwd bt_prev, bt_next, // prev, next NULL, NULL, NULL, NULL, // left, right, up, down - NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6 + NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6 bt_volume_down, bt_volume_up, bt_toggle// knob left, knob_right, knob push };