lib/mpg123
1
0
Fork 0
mirror of http://mpg123.de/trunk/.git synced 2025-10-25 04:37:34 +03:00
Code Activity

Buffer now says "Hey" now on succesful startup and the main process checks for that.

Browse Source 
A bad audio module setting now has the expected result... abort at the correct place.


git-svn-id: svn://scm.orgis.org/mpg123/trunk@1267 35dc7657-300d-0410-a2e5-dc2837fedb53
This commit is contained in:
thor
2007-12-08 13:31:40 +00:00
parent 18a7a7f519
commit e3705999fd
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio.c
View File

@@ -346,6 +346,15 @@ int init_output(audio_output_t **ao)
} }
} }
else *ao = NULL; /* That ensures we won't try to free it later... */ else *ao = NULL; /* That ensures we won't try to free it later... */
if(param.usebuffer)
{ /* Check if buffer is alive. */
int res = xfermem_getcmd(buffermem->fd[XF_WRITER], TRUE);
if(res < 0)
{
error("Buffer process didn't initialize!");
return -1;
}
}
/* This has internal protection for buffer mode. */ /* This has internal protection for buffer mode. */
if(open_output(*ao) < 0) return -1; if(open_output(*ao) < 0) return -1;

1
src/buffer.c
View File

@@ -117,6 +117,7 @@ void buffer_loop(audio_output_t *ao, sigset_t *oldsigset)
catchsignal (SIGUSR1, catch_usr1); catchsignal (SIGUSR1, catch_usr1);
sigprocmask (SIG_SETMASK, oldsigset, NULL); sigprocmask (SIG_SETMASK, oldsigset, NULL);
xfermem_putcmd(my_fd, XF_CMD_WAKEUP);
if(param.outmode == DECODE_AUDIO) if(param.outmode == DECODE_AUDIO)
{ {
debug("audio output: waiting for cap requests"); debug("audio output: waiting for cap requests");