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

fifo: removed timer!=NULL checks

Browse Source 
The MPD core guarantees that the audio_output object is always
consistent, and our timer!=NULL checks are superfluous.
This commit is contained in:
Max Kellermann 2009-02-25 19:09:38 +01:00
parent ba4dd651ef
commit ee7cf9c9b8
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/output/fifo_plugin.c
View File

@ -52,7 +52,6 @@ static FifoData *newFifoData(void)
ret->input = -1; ret->input = -1;
ret->output = -1; ret->output = -1;
ret->created = 0; ret->created = 0;
ret->timer = NULL;
return ret; return ret;
} }
@ -60,10 +59,6 @@ static FifoData *newFifoData(void)
static void freeFifoData(FifoData *fd) static void freeFifoData(FifoData *fd)
{ {
g_free(fd->path); g_free(fd->path);
if (fd->timer)
timer_free(fd->timer);
g_free(fd); g_free(fd);
} }
@ -202,9 +197,6 @@ static bool fifo_openDevice(void *data,
{ {
FifoData *fd = (FifoData *)data; FifoData *fd = (FifoData *)data;
if (fd->timer)
timer_free(fd->timer);
fd->timer = timer_new(audio_format); fd->timer = timer_new(audio_format);
return true; return true;
@ -214,10 +206,7 @@ static void fifo_closeDevice(void *data)
{ {
FifoData *fd = (FifoData *)data; FifoData *fd = (FifoData *)data;
if (fd->timer) { timer_free(fd->timer);
timer_free(fd->timer);
fd->timer = NULL;
}
} }
static void fifo_dropBufferedAudio(void *data) static void fifo_dropBufferedAudio(void *data)