mpg123-1.32.10

src/libmpg123/format.c

@@ -688,7 +688,7 @@ static void conv_s16_to_s32(struct outbuffer *buf)
 
 #include "../common/swap_bytes_impl.h"
 
-void swap_endian(struct outbuffer *buf, int block)
+static void swap_endian(struct outbuffer *buf, int block)
 {
 	size_t count;
 

src/libmpg123/id3.c

@@ -794,7 +794,7 @@ static int promote_framename(mpg123_handle *fr, char *id) /* fr because of VERBO
 
 #endif /* NO_ID3V2 */
 
-int store_id3v2( mpg123_handle *fr
+static int store_id3v2( mpg123_handle *fr
 ,	unsigned long first4bytes, unsigned char buf[6], unsigned long length )
 {
 	int ret = 1;

src/libmpg123/mpg123lib_intern.h

@@ -21,7 +21,10 @@
 
 // Only portable API plays a role in the library itself, outside of lfs_wrap.c.
 // Also, we need to ensure no suffix renaming for the primary implementations.
-#define MPG123_PORTABLE_API
+// But: The _definition_ of non-portable API needs to be present for those
+// primary implementations being exported for DLL builds. Just the largefile
+// renaming needs to be skipped!
+#define MPG123_NO_LARGENAME
 #define MPG123_ENUM_API
 #include "mpg123.h"
 

src/libmpg123/optimize.c

@@ -1027,7 +1027,7 @@ static const char *mpg123_decoder_list[] =
 	NULL
 };
 
-void check_decoders(void)
+static void check_decoders(void)
 {
 #ifndef OPT_MULTI
 	/* In non-multi mode, only the full list (one entry) is used. */

src/libout123/libout123.c

@@ -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)
 			{

src/libout123/modules/sndio.c

@@ -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);

src/version.h

@@ -16,7 +16,7 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 9
+#define MPG123_PATCH 10
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
 #define MPG123_SUFFIX ""