From 18b830eaa3bf011e3e8dabc78a9d5f847a1b747b Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 2 Apr 2023 13:40:07 -0700 Subject: [PATCH] add preset 7..10 --- components/services/audio_controls.c | 2 +- components/services/audio_controls.h | 2 +- components/squeezelite/controls.c | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/components/services/audio_controls.c b/components/services/audio_controls.c index 0e2cf8b8..b8314955 100644 --- a/components/services/audio_controls.c +++ b/components/services/audio_controls.c @@ -60,7 +60,7 @@ static const actrls_config_map_t actrls_config_map[] = 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(BCTRLS_UP),EP(BCTRLS_DOWN),EP(BCTRLS_LEFT),EP(BCTRLS_RIGHT), - EP(BCTRLS_PS1),EP(BCTRLS_PS2),EP(BCTRLS_PS3),EP(BCTRLS_PS4),EP(BCTRLS_PS5),EP(BCTRLS_PS6), + EP(BCTRLS_PS1),EP(BCTRLS_PS2),EP(BCTRLS_PS3),EP(BCTRLS_PS4),EP(BCTRLS_PS5),EP(BCTRLS_PS6),EP(BCTRLS_PS7),EP(BCTRLS_PS8),EP(BCTRLS_PS9),EP(BCTRLS_PS10), EP(KNOB_LEFT),EP(KNOB_RIGHT),EP(KNOB_PUSH), ""} ; diff --git a/components/services/audio_controls.h b/components/services/audio_controls.h index d27fdb5b..02fac910 100644 --- a/components/services/audio_controls.h +++ b/components/services/audio_controls.h @@ -14,7 +14,7 @@ typedef enum { ACTRLS_NONE = -1, ACTRLS_POWER,ACTRLS_VOLUP, ACTRLS_VOLDOWN, ACTRLS_TOGGLE, ACTRLS_PLAY, ACTRLS_PAUSE, ACTRLS_STOP, ACTRLS_REW, ACTRLS_FWD, ACTRLS_PREV, ACTRLS_NEXT, BCTRLS_UP, BCTRLS_DOWN, BCTRLS_LEFT, BCTRLS_RIGHT, - BCTRLS_PS1,BCTRLS_PS2,BCTRLS_PS3,BCTRLS_PS4,BCTRLS_PS5,BCTRLS_PS6, + BCTRLS_PS1,BCTRLS_PS2,BCTRLS_PS3,BCTRLS_PS4,BCTRLS_PS5,BCTRLS_PS6,BCTRLS_PS7,BCTRLS_PS8,BCTRLS_PS9,BCTRLS_PS10, KNOB_LEFT, KNOB_RIGHT, KNOB_PUSH, ACTRLS_REMAP, ACTRLS_MAX } actrls_action_e; diff --git a/components/squeezelite/controls.c b/components/squeezelite/controls.c index 682e6178..7bd2ecfd 100644 --- a/components/squeezelite/controls.c +++ b/components/squeezelite/controls.c @@ -21,7 +21,8 @@ static log_level loglevel = lINFO; enum { BUTN_POWER_FRONT = 0X0A, BUTN_ARROW_UP, BUTN_ARROW_DOWN, BUTN_ARROW_LEFT, BUTN_KNOB_PUSH, BUTN_SEARCH, BUTN_REW, BUTN_FWD, BUTN_PLAY, BUTN_ADD, BUTN_BRIGHTNESS, BUTN_NOW_PLAYING, BUTN_PAUSE = 0X17, BUTN_BROWSE, BUTN_VOLUP_FRONT, BUTN_VOLDOWN_FRONT, BUTN_SIZE, BUTN_VISUAL, BUTN_VOLUMEMODE, - BUTN_PRESET_1 = 0X23, BUTN_PRESET_2, BUTN_PRESET_3, BUTN_PRESET_4, BUTN_PRESET_5, BUTN_PRESET_6, BUTN_SNOOZE, + BUTN_PRESET_1 = 0X23, BUTN_PRESET_2, BUTN_PRESET_3, BUTN_PRESET_4, BUTN_PRESET_5, BUTN_PRESET_6, BUTN_PRESET_7, BUTN_PRESET_8, BUTN_PRESET_9, BUTN_PRESET_10, + BUTN_SNOOZE, BUTN_KNOB_LEFT = 0X5A, BUTN_KNOB_RIGHT }; #define BUTN_ARROW_RIGHT BUTN_KNOB_PUSH @@ -148,6 +149,10 @@ LMS_CALLBACK(pre3, PRESET_3, preset_3.single) LMS_CALLBACK(pre4, PRESET_4, preset_4.single) LMS_CALLBACK(pre5, PRESET_5, preset_5.single) LMS_CALLBACK(pre6, PRESET_6, preset_6.single) +LMS_CALLBACK(pre7, PRESET_7, preset_7.single) +LMS_CALLBACK(pre8, PRESET_8, preset_8.single) +LMS_CALLBACK(pre9, PRESET_9, preset_9.single) +LMS_CALLBACK(pre10, PRESET_10, preset_10.single) LMS_CALLBACK(knob_left, KNOB_LEFT, knob_left) LMS_CALLBACK(knob_right, KNOB_RIGHT, knob_right) @@ -162,7 +167,7 @@ const actrls_t LMS_controls = { lms_prev, lms_next, // prev, next lms_up, lms_down, lms_left, lms_right, - lms_pre1, lms_pre2, lms_pre3, lms_pre4, lms_pre5, lms_pre6, + lms_pre1, lms_pre2, lms_pre3, lms_pre4, lms_pre5, lms_pre6, lms_pre7, lms_pre8, lms_pre9, lms_pre10, lms_knob_left, lms_knob_right, lms_knob_push, };