Skip to content

M
mpd
Commit c37567a1 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

audio: converted device number check to assertion

No caller must ever pass an invalid device number to mixer_control_setvol() or mixer_control_getvol().
parent e9cbb6be
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/mixer_control.c
View file @ c37567a1
...@@ -22,14 +22,15 @@ ...@@ -22,14 +22,15 @@
#include "output_plugin.h" #include "output_plugin.h"
#include "output_internal.h" #include "output_internal.h"
#include <assert.h>
bool bool
mixer_control_setvol(unsigned int device, int volume, int rel) mixer_control_setvol(unsigned int device, int volume, int rel)
{ {
struct audio_output *output; struct audio_output *output;
struct mixer *mixer; struct mixer *mixer;
if (device >= audio_output_count()) assert(device < audio_output_count());
return false;
output = audio_output_get(device); output = audio_output_get(device);
mixer = ao_plugin_get_mixer(output->plugin, output->data); mixer = ao_plugin_get_mixer(output->plugin, output->data);
...@@ -57,8 +58,7 @@ mixer_control_getvol(unsigned int device, int *volume) ...@@ -57,8 +58,7 @@ mixer_control_getvol(unsigned int device, int *volume)
struct audio_output *output; struct audio_output *output;
struct mixer *mixer; struct mixer *mixer;
if (device >= audio_output_count()) assert(device < audio_output_count());
return false;
output = audio_output_get(device); output = audio_output_get(device);
mixer = ao_plugin_get_mixer(output->plugin, output->data); mixer = ao_plugin_get_mixer(output->plugin, output->data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment