Skip to content

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

oss_mixer: pass default path to config_get_block_string()

Instead of replacing NULL with the default path in the open() method, pass the default path to config_get_block_string().
parent aec4fe06
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
src/mixer/oss_mixer.c
View file @ 114d5982
......@@ -54,7 +54,8 @@ oss_mixer_init(const struct config_param *param)
mixer_init(&om->base, &oss_mixer);
om->device = config_get_block_string(param, "mixer_device", NULL);
om->device = config_get_block_string(param, "mixer_device",
VOLUME_MIXER_OSS_DEFAULT);
om->control = config_get_block_string(param, "mixer_control", NULL);
om->device_fd = -1;
......@@ -99,14 +100,10 @@ static bool
oss_mixer_open(struct mixer *data)
{
struct oss_mixer *om = (struct oss_mixer *) data;
const char *device = VOLUME_MIXER_OSS_DEFAULT;
if (om->device) {
device = om->device;
}
if ((om->device_fd = open(device, O_RDONLY)) < 0) {
g_warning("Unable to open oss mixer \"%s\"\n", device);
om->device_fd = open(om->device, O_RDONLY);
if (om->device_fd < 0) {
g_warning("Unable to open oss mixer \"%s\"\n", om->device);
return false;
}
......
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