oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

audio: converted device number check to assertion

Browse Source 
No caller must ever pass an invalid device number to
mixer_control_setvol() or mixer_control_getvol().
This commit is contained in:
Max Kellermann 2009-03-12 18:34:38 +01:00
parent e9cbb6be3f
commit c37567a14f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mixer_control.c
View File

@ -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)
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);