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

alsa_mixer: make "device" and "control" const

Browse Source 
Use config_get_block_string() instead of config_dup_block_string().
This commit is contained in:
Max Kellermann 2009-03-26 19:48:55 +01:00
parent c552d17c03
commit f06f049cd8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mixer/alsa_mixer.c
View File

@ -30,8 +30,9 @@ struct alsa_mixer {
/** the base mixer class */ /** the base mixer class */
struct mixer base; struct mixer base;
char *device; const char *device;
char *control; const char *control;
snd_mixer_t *handle; snd_mixer_t *handle;
snd_mixer_elem_t *elem; snd_mixer_elem_t *elem;
long volume_min; long volume_min;
@ -46,8 +47,8 @@ alsa_mixer_init(const struct config_param *param)
mixer_init(&am->base, &alsa_mixer); mixer_init(&am->base, &alsa_mixer);
am->device = config_dup_block_string(param, "mixer_device", NULL); am->device = config_get_block_string(param, "mixer_device", NULL);
am->control = config_dup_block_string(param, "mixer_control", NULL); am->control = config_get_block_string(param, "mixer_control", NULL);
am->handle = NULL; am->handle = NULL;
am->elem = NULL; am->elem = NULL;
@ -63,8 +64,6 @@ alsa_mixer_finish(struct mixer *data)
{ {
struct alsa_mixer *am = (struct alsa_mixer *)data; struct alsa_mixer *am = (struct alsa_mixer *)data;
g_free(am->device);
g_free(am->control);
g_free(am); g_free(am);
} }