david/mpg123
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpg123-1.32.10

Browse Source
This commit is contained in:
Ozkan Sezer
2024-12-15 10:28:28 +03:00
parent fc1ca4a8f9
commit 22dadfaa3c
15 changed files with 89 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libout123/libout123.c
View File

@@ -1,7 +1,7 @@
/*
audio: audio output interface
copyright ?-2023 by the mpg123 project - free software under the terms of the LGPL 2.1
copyright ?-2024 by the mpg123 project - free software under the terms of the LGPL 2.1
see COPYING and AUTHORS files in distribution or http://mpg123.org
initially written by Michael Hipp
*/
@@ -455,11 +455,12 @@ out123_open(out123_handle *ao, const char* driver, const char* device)
}
/* Now loop over the list of possible modules to find one that works. */
nextname = strtok(modnames, ",");
char *toksave = NULL;
nextname = strtok_r(modnames, ",", &toksave);
while(!ao->open && nextname)
{
char *curname = nextname;
nextname = strtok(NULL, ",");
nextname = strtok_r(NULL, ",", &toksave);
check_output_module(ao, curname, device, !nextname);
if(ao->open)
{

6
src/libout123/modules/sndio.c
View File

@@ -129,7 +129,8 @@ static int open_sndio(out123_handle *ao)
hdl = sio_open(ao->device /* NULL is fine */, SIO_PLAY, 0);
if (hdl == NULL)
{
error("Got nothing from sio_open(). ");
if(!AOQUIET)
error("Got nothing from sio_open(). ");
return -1;
}
@@ -152,7 +153,8 @@ static int open_sndio(out123_handle *ao)
hdl = sio_open(ao->device, SIO_PLAY, 0);
if(hdl == NULL)
{
error("Re-opening of device for channel guessing failed.");
if(!AOQUIET)
error("Re-opening of device for channel guessing failed.");
return -1;
}
par.pchan = guess_channels(hdl);