3 files changed, 8 insertions, 23 deletions

diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c
index 71e5310638..de31733671 100644
--- a/apps/plugins/lrcplayer.c
+++ b/apps/plugins/lrcplayer.c
@@ -2625,16 +2625,10 @@ static int handle_button(void)
                 ff_rewind(0, false);
             break;
         case ACTION_WPS_VOLDOWN:
-            limit = rb->sound_min(SOUND_VOLUME);
-            if (--rb->global_settings->volume < limit)
-                rb->global_settings->volume = limit;
-            rb->sound_set(SOUND_VOLUME, rb->global_settings->volume);
+            rb->adjust_volume(-1);
             break;
         case ACTION_WPS_VOLUP:
-            limit = rb->sound_max(SOUND_VOLUME);
-            if (++rb->global_settings->volume > limit)
-                rb->global_settings->volume = limit;
-            rb->sound_set(SOUND_VOLUME, rb->global_settings->volume);
+            rb->adjust_volume(1);
             break;
         case ACTION_WPS_CONTEXT:
             ret = LRC_GOTO_EDITOR;
diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c
index 6622b5fdb6..65633c0ad1 100644
--- a/apps/plugins/mikmod/mikmod.c
+++ b/apps/plugins/mikmod/mikmod.c
@@ -710,7 +710,6 @@ static void mm_errorhandler(void)
 
 static int playfile(char* filename)
 {
-    int vol = 0;
     int button;
     int retval = PLUGIN_OK;
     bool changingpos = false;
@@ -789,13 +788,8 @@ static int playfile(char* filename)
                 }
                 break;
             }
-            vol = rb->global_settings->volume;
-            if (vol < rb->sound_max(SOUND_VOLUME))
-            {
-                vol++;
-                rb->sound_set(SOUND_VOLUME, vol);
-                rb->global_settings->volume = vol;
-            }
+
+            rb->adjust_volume(1);
             break;
 
         case ACTION_WPS_VOLDOWN:
@@ -808,13 +802,8 @@ static int playfile(char* filename)
                 }
                 break;
             }
-            vol = rb->global_settings->volume;
-            if (vol > rb->sound_min(SOUND_VOLUME))
-            {
-                vol--;
-                rb->sound_set(SOUND_VOLUME, vol);
-                rb->global_settings->volume = vol;
-            }
+
+            rb->adjust_volume(-1);
             break;
 
         case ACTION_WPS_SKIPPREV:
diff --git a/apps/plugins/sdl/SDL_mixer/timidity/playmidi.c b/apps/plugins/sdl/SDL_mixer/timidity/playmidi.c
index 1638732dc5..38f7109b13 100644
--- a/apps/plugins/sdl/SDL_mixer/timidity/playmidi.c
+++ b/apps/plugins/sdl/SDL_mixer/timidity/playmidi.c
@@ -21,6 +21,8 @@
 
 #include "tables.h"
 
+/* ROCKBOX HACK: avoid a conflict with adjust_volume() in misc.h */
+#define adjust_volume adjust_midi_volume
 
 static int opt_expression_curve = 2;
 static int opt_volume_curve = 2;