mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: cleanup

Browse source
This commit is contained in:
Wim Taymans 2018-11-28 12:27:17 +01:00
parent 5d30b31cec
commit 0c9dc75cb3
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/plugins/alsa/alsa-device.c
View file

@ -66,8 +66,6 @@ struct impl {
const struct spa_device_callbacks *callbacks; const struct spa_device_callbacks *callbacks;
void *callbacks_data; void *callbacks_data;
snd_ctl_t *ctl_hndl;
struct props props; struct props props;
}; };
@ -131,19 +129,20 @@ static int emit_info(struct impl *this)
{ {
int err = 0, dev; int err = 0, dev;
struct spa_dict_item items[8]; struct spa_dict_item items[8];
snd_ctl_t *ctl_hndl;
snd_ctl_card_info_t *info; snd_ctl_card_info_t *info;
snd_pcm_info_t *pcminfo; snd_pcm_info_t *pcminfo;
spa_log_info(this->log, "open card %s", this->props.device); spa_log_info(this->log, "open card %s", this->props.device);
if ((err = snd_ctl_open(&this->ctl_hndl, this->props.device, 0)) < 0) { if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
spa_log_error(this->log, "can't open control for card %s: %s", spa_log_error(this->log, "can't open control for card %s: %s",
this->props.device, snd_strerror(err)); this->props.device, snd_strerror(err));
return err; return err;
} }
snd_ctl_card_info_alloca(&info); snd_ctl_card_info_alloca(&info);
if ((err = snd_ctl_card_info(this->ctl_hndl, info)) < 0) { if ((err = snd_ctl_card_info(ctl_hndl, info)) < 0) {
spa_log_error(this->log, "error hardware info: %s", snd_strerror(err)); spa_log_error(this->log, "error hardware info: %s", snd_strerror(err));
goto exit; goto exit;
} }
@ -163,7 +162,7 @@ static int emit_info(struct impl *this)
snd_pcm_info_alloca(&pcminfo); snd_pcm_info_alloca(&pcminfo);
dev = -1; dev = -1;
while (1) { while (1) {
if ((err = snd_ctl_pcm_next_device(this->ctl_hndl, &dev)) < 0) { if ((err = snd_ctl_pcm_next_device(ctl_hndl, &dev)) < 0) {
spa_log_error(this->log, "error iterating devices: %s", snd_strerror(err)); spa_log_error(this->log, "error iterating devices: %s", snd_strerror(err));
goto exit; goto exit;
} }
@ -174,7 +173,7 @@ static int emit_info(struct impl *this)
snd_pcm_info_set_subdevice(pcminfo, 0); snd_pcm_info_set_subdevice(pcminfo, 0);
snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_PLAYBACK); snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_PLAYBACK);
if ((err = snd_ctl_pcm_info(this->ctl_hndl, pcminfo)) < 0) { if ((err = snd_ctl_pcm_info(ctl_hndl, pcminfo)) < 0) {
if (err != -ENOENT) if (err != -ENOENT)
spa_log_error(this->log, "error pcm info: %s", snd_strerror(err)); spa_log_error(this->log, "error pcm info: %s", snd_strerror(err));
} }
@ -182,7 +181,7 @@ static int emit_info(struct impl *this)
emit_node(this, pcminfo); emit_node(this, pcminfo);
snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE); snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
if ((err = snd_ctl_pcm_info(this->ctl_hndl, pcminfo)) < 0) { if ((err = snd_ctl_pcm_info(ctl_hndl, pcminfo)) < 0) {
if (err != -ENOENT) if (err != -ENOENT)
spa_log_error(this->log, "error pcm info: %s", snd_strerror(err)); spa_log_error(this->log, "error pcm info: %s", snd_strerror(err));
} }
@ -191,7 +190,7 @@ static int emit_info(struct impl *this)
} }
exit: exit:
snd_ctl_close(this->ctl_hndl); snd_ctl_close(ctl_hndl);
return err; return err;
} }