From 1dc8a5a8ceefb5f2ba9168142c13f051c5dc0ef8 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Tue, 18 Mar 2025 10:58:26 -0400
Subject: [PATCH] Revert "mikmod:  Invert scrolling on everything that's not an
 ipod"

It fixes scrolling but inverts the volume, which is worse.

This reverts commit 003da4d2237c772df74c4f37a7332c4c1b564182.
---
 apps/plugins/mikmod/mikmod.c | 8 --------
 manual/plugins/mikmod.tex    | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c
index f1d9c9ce54..99d5aca148 100644
--- a/apps/plugins/mikmod/mikmod.c
+++ b/apps/plugins/mikmod/mikmod.c
@@ -790,11 +790,7 @@ 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 )
@@ -808,11 +804,7 @@ 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 bbdbd7d2b5..2564dadef2 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}{\ButtonScrollBack/ \ButtonScrollFwd}
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd/ \ButtonScrollBack}
     \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}{& }
-    & Scroll up/ Scroll down\\
+    & Volume up/ Volume 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%