summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/mixer.c14
-rw-r--r--audio/mixer.h3
2 files changed, 3 insertions, 14 deletions
diff --git a/audio/mixer.c b/audio/mixer.c
index 162d9d5a0a..a9759976a2 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -172,21 +172,11 @@ bool mixer_getmute(struct mixer *mixer)
return mixer->muted;
}
-static void addvolume(struct mixer *mixer, float d)
+void mixer_addvolume(struct mixer *mixer, float step)
{
float vol_l, vol_r;
mixer_getvolume(mixer, &vol_l, &vol_r);
- mixer_setvolume(mixer, vol_l + d, vol_r + d);
-}
-
-void mixer_incvolume(struct mixer *mixer)
-{
- addvolume(mixer, mixer->opts->volstep);
-}
-
-void mixer_decvolume(struct mixer *mixer)
-{
- addvolume(mixer, -mixer->opts->volstep);
+ mixer_setvolume(mixer, vol_l + step, vol_r + step);
}
void mixer_getbalance(struct mixer *mixer, float *val)
diff --git a/audio/mixer.h b/audio/mixer.h
index 7a14e0b23e..d5ec07e9ba 100644
--- a/audio/mixer.h
+++ b/audio/mixer.h
@@ -39,8 +39,7 @@ void mixer_uninit_audio(struct mixer *mixer);
bool mixer_audio_initialized(struct mixer *mixer);
void mixer_getvolume(struct mixer *mixer, float *l, float *r);
void mixer_setvolume(struct mixer *mixer, float l, float r);
-void mixer_incvolume(struct mixer *mixer);
-void mixer_decvolume(struct mixer *mixer);
+void mixer_addvolume(struct mixer *mixer, float step);
void mixer_getbothvolume(struct mixer *mixer, float *b);
void mixer_setmute(struct mixer *mixer, bool mute);
bool mixer_getmute(struct mixer *mixer);