From cde5ae755fde5b645ab287a91c613f803a88d79d Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Wed, 24 Feb 2021 12:44:39 +0100 Subject: iPods: Allow using scroll wheel to change volume on QuickScreen As suggested by forum user yuuiko Change-Id: Ifb989f9513a9e3c59e4ab0f38c0a8e2675c68dd8 --- apps/action.h | 2 ++ apps/gui/quickscreen.c | 10 +++++++++- apps/keymaps/keymap-ipod.c | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/action.h b/apps/action.h index 3f0d593d6a..b434a38470 100644 --- a/apps/action.h +++ b/apps/action.h @@ -245,6 +245,8 @@ enum { ACTION_QS_RIGHT, ACTION_QS_DOWN, ACTION_QS_TOP, + ACTION_QS_VOLUP, + ACTION_QS_VOLDOWN, /* pitchscreen */ /* obviously ignore if you dont have thise screen */ diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 2ce09ae474..b5113df8f6 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c @@ -26,6 +26,7 @@ #include "font.h" #include "kernel.h" #include "misc.h" +#include "sound.h" #include "action.h" #include "settings_list.h" #include "lang.h" @@ -361,7 +362,14 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente } else if (button == button_enter) can_quit = true; - + else if (button == ACTION_QS_VOLUP) { + global_settings.volume += sound_steps(SOUND_VOLUME); + setvol(); + } + else if (button == ACTION_QS_VOLDOWN) { + global_settings.volume -= sound_steps(SOUND_VOLUME); + setvol(); + } if ((button == button_enter) && can_quit) break; diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index a438926dd9..ca52b6b216 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c @@ -132,6 +132,10 @@ static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE }, + { ACTION_QS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, + { ACTION_QS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_QS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, + { ACTION_QS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ -- cgit v1.2.3