From 003da4d2237c772df74c4f37a7332c4c1b564182 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Tue, 11 Mar 2025 08:34:52 -0400 Subject: [PATCH] mikmod: Invert scrolling on everything that's not an ipod mikmod uses WPS_VOLUP and WPS_VOLDOWN to scroll down and up respectively, which works for the ipod clickwheel, but results in inverted scrolling for everyone else. Correct this for all non-ipods and correct the manul (which actually didn't report this either) Change-Id: I5a84512dfbf068ca5c4206f4362185d4d7e5c9fc --- apps/plugins/mikmod/mikmod.c | 8 ++++++++ manual/plugins/mikmod.tex | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c index 99d5aca148..f1d9c9ce54 100644 --- a/apps/plugins/mikmod/mikmod.c +++ b/apps/plugins/mikmod/mikmod.c @@ -790,7 +790,11 @@ static int playfile(char* filename) button = rb->get_action(CONTEXT_WPS, TIMEOUT_NOBLOCK); switch (button) { +#ifdef HAVE_SCROLLWHEEL case ACTION_WPS_VOLUP: +#else + case ACTION_WPS_VOLDOWN: +#endif if ( display != DISPLAY_INFO ) { if ( textlines-vscroll >= MAX_LINES ) @@ -804,7 +808,11 @@ static int playfile(char* filename) rb->adjust_volume(1); break; +#ifdef HAVE_SCROLLWHEEL case ACTION_WPS_VOLDOWN: +#else + case ACTION_WPS_VOLUP: +#endif if ( display != DISPLAY_INFO ) { if ( vscroll > 0 ) diff --git a/manual/plugins/mikmod.tex b/manual/plugins/mikmod.tex index 2564dadef2..bbdbd7d2b5 100644 --- a/manual/plugins/mikmod.tex +++ b/manual/plugins/mikmod.tex @@ -6,13 +6,13 @@ Mikmod plays most common tracker music formats. \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% ,IAUDIO_X5_PAD,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD% ,SAMSUNG_YH820_PAD}{\ButtonUp/ \ButtonDown} - \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd/ \ButtonScrollBack} + \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack/ \ButtonScrollFwd} \opt{IRIVER_H10_PAD,MPIO_HD300_PAD}{\ButtonScrollUp/ \ButtonScrollDown} \opt{SANSA_C200_PAD,SANSA_CLIP_PAD,MPIO_HD200_PAD}{\ButtonVolUp/ \ButtonVolDown} \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle} \opt{XDUOO_X3_PAD}{\ButtonVolUp/ \ButtonVolDown} \opt{HAVEREMOTEKEYMAP}{& } - & Volume up/ Volume down\\ + & Scroll up/ Scroll down\\ % \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% ,IAUDIO_X5_PAD,MROBE100_PAD,IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD%