aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/alsa_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-03-10 21:25:45 +0100
committerMax Kellermann <max@duempel.org>2009-03-10 21:25:45 +0100
commit855054fee1884f43aeca18b0d1218f9c9220f5e7 (patch)
tree7f7caebd8b65c605647843a9b6824c449bc76611 /src/output/alsa_plugin.c
parent538701e7c612cf68f7bbadc2329046b09062a988 (diff)
downloadmpd-855054fee1884f43aeca18b0d1218f9c9220f5e7.tar.gz
mpd-855054fee1884f43aeca18b0d1218f9c9220f5e7.tar.xz
mpd-855054fee1884f43aeca18b0d1218f9c9220f5e7.zip
alsa: don't close PCM handle in alsa_recover()
If the PCM handle gets disconnected, don't close and clear it in alsa_recover(). The MPD core will call alsa_close() anyway. This way, we can always assume that alsa_data.pcm is always valid.
Diffstat (limited to 'src/output/alsa_plugin.c')
-rw-r--r--src/output/alsa_plugin.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c
index 923d70ad8..e8d86b4cd 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -94,7 +94,6 @@ alsa_data_new(void)
struct alsa_data *ret = g_new(struct alsa_data, 1);
ret->mode = 0;
- ret->pcm = NULL;
ret->writei = snd_pcm_writei;
return ret;
@@ -413,8 +412,6 @@ alsa_open(void *data, struct audio_format *audio_format, GError **error)
err = snd_pcm_open(&ad->pcm, alsa_device(ad),
SND_PCM_STREAM_PLAYBACK, ad->mode);
if (err < 0) {
- ad->pcm = NULL;
-
g_set_error(error, alsa_output_quark(), err,
"Failed to open ALSA device \"%s\": %s",
alsa_device(ad), snd_strerror(err));
@@ -424,7 +421,6 @@ alsa_open(void *data, struct audio_format *audio_format, GError **error)
success = alsa_setup(ad, audio_format, bitformat, error);
if (!success) {
snd_pcm_close(ad->pcm);
- ad->pcm = NULL;
return false;
}
@@ -456,9 +452,6 @@ alsa_recover(struct alsa_data *ad, int err)
err = snd_pcm_prepare(ad->pcm);
break;
case SND_PCM_STATE_DISCONNECTED:
- /* so alsa_closeDevice won't try to drain: */
- snd_pcm_close(ad->pcm);
- ad->pcm = NULL;
break;
/* this is no error, so just keep running */
case SND_PCM_STATE_RUNNING:
@@ -485,13 +478,10 @@ alsa_close(void *data)
{
struct alsa_data *ad = data;
- if (ad->pcm != NULL) {
- if (snd_pcm_state(ad->pcm) == SND_PCM_STATE_RUNNING)
- snd_pcm_drain(ad->pcm);
+ if (snd_pcm_state(ad->pcm) == SND_PCM_STATE_RUNNING)
+ snd_pcm_drain(ad->pcm);
- snd_pcm_close(ad->pcm);
- ad->pcm = NULL;
- }
+ snd_pcm_close(ad->pcm);
mixer_close(ad->mixer);
}