diff options
Diffstat (limited to '')
| -rw-r--r-- | src/mixer_all.c | 14 | ||||
| -rw-r--r-- | src/mixer_all.h | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/mixer_all.c b/src/mixer_all.c index 252cb61ab..21ff44c35 100644 --- a/src/mixer_all.c +++ b/src/mixer_all.c @@ -70,7 +70,7 @@ mixer_all_get_volume(void) } static bool -output_mixer_set_volume(unsigned i, int volume, bool relative) +output_mixer_set_volume(unsigned i, int volume) { struct audio_output *output; struct mixer *mixer; @@ -85,14 +85,6 @@ output_mixer_set_volume(unsigned i, int volume, bool relative) if (mixer == NULL) return false; - if (relative) { - int prev = mixer_get_volume(mixer); - if (prev < 0) - return false; - - volume += prev; - } - if (volume > 100) volume = 100; else if (volume < 0) @@ -102,13 +94,13 @@ output_mixer_set_volume(unsigned i, int volume, bool relative) } bool -mixer_all_set_volume(int volume, bool relative) +mixer_all_set_volume(int volume) { bool success = false; unsigned count = audio_output_count(); for (unsigned i = 0; i < count; i++) - success = output_mixer_set_volume(i, volume, relative) + success = output_mixer_set_volume(i, volume) || success; return success; diff --git a/src/mixer_all.h b/src/mixer_all.h index 66c4988de..1f6e016df 100644 --- a/src/mixer_all.h +++ b/src/mixer_all.h @@ -37,11 +37,10 @@ mixer_all_get_volume(void); /** * Sets the volume on all available mixers. * - * @param volume the volume (range 0..100 or -100..100 if #relative) - * @param relative if true, then the #volume is added to the current value + * @param volume the volume (range 0..100) * @return true on success, false on failure */ bool -mixer_all_set_volume(int volume, bool relative); +mixer_all_set_volume(int volume); #endif |