Skip to content

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

oss_mixer: make "device" and "control" const

Use config_get_block_string() instead of config_dup_block_string().
parent 69759b57
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
src/mixer/oss_mixer.c
View file @ aec4fe06
...@@ -40,8 +40,9 @@ struct oss_mixer { ...@@ -40,8 +40,9 @@ struct oss_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;
int device_fd; int device_fd;
int volume_control; int volume_control;
}; };
...@@ -53,8 +54,8 @@ oss_mixer_init(const struct config_param *param) ...@@ -53,8 +54,8 @@ oss_mixer_init(const struct config_param *param)
mixer_init(&om->base, &oss_mixer); mixer_init(&om->base, &oss_mixer);
om->device = config_dup_block_string(param, "mixer_device", NULL); om->device = config_get_block_string(param, "mixer_device", NULL);
om->control = config_dup_block_string(param, "mixer_control", NULL); om->control = config_get_block_string(param, "mixer_control", NULL);
om->device_fd = -1; om->device_fd = -1;
om->volume_control = SOUND_MIXER_PCM; om->volume_control = SOUND_MIXER_PCM;
...@@ -67,8 +68,6 @@ oss_mixer_finish(struct mixer *data) ...@@ -67,8 +68,6 @@ oss_mixer_finish(struct mixer *data)
{ {
struct oss_mixer *om = (struct oss_mixer *) data; struct oss_mixer *om = (struct oss_mixer *) data;
g_free(om->device);
g_free(om->control);
g_free(om); g_free(om);
} }
......
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