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

pulse: removed pa_simple!=NULL checks

Browse Source 
The MPD core guarantees that the audio_output object is always
consistent, and our pa_simple!=NULL checks are superfluous.  Also
don't manually close the device on error in pulse_play(), since the
MPD core does this automatically when the play() method returns 0.
This commit is contained in:
Max Kellermann 2009-02-26 19:29:06 +01:00
parent 4f2ac7ec2c
commit 710a61a3dc
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/pulse_plugin.c
View File

@ -38,7 +38,6 @@ static struct pulse_data *pulse_new_data(void)
ret = g_new(struct pulse_data, 1);
ret->s = NULL;
ret->server = NULL;
ret->sink = NULL;
@ -138,9 +137,6 @@ static void pulse_cancel(void *data)
struct pulse_data *pd = data;
int error;
if (pd->s == NULL)
return;
if (pa_simple_flush(pd->s, &error) < 0)
g_warning("Flush failed in PulseAudio output \"%s\": %s\n",
pd->name, pa_strerror(error));
@ -150,11 +146,8 @@ static void pulse_close(void *data)
{
struct pulse_data *pd = data;
if (pd->s) {
pa_simple_drain(pd->s, NULL);
pa_simple_free(pd->s);
pd->s = NULL;
}
pa_simple_drain(pd->s, NULL);
pa_simple_free(pd->s);
}
static size_t
@ -167,7 +160,6 @@ pulse_play(void *data, const void *chunk, size_t size)
g_warning("PulseAudio output \"%s\" disconnecting due to "
"write error: %s\n",
pd->name, pa_strerror(error));
pulse_close(pd);
return 0;
}