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

mpg123-1.32.4

Browse Source
This commit is contained in:
Ozkan Sezer
2024-01-10 20:40:40 +03:00
parent 530d2f6056
commit a06847ca33
142 changed files with 1370 additions and 1487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makemodule.am
View File

@@ -2,6 +2,7 @@
include src/tests/Makemodule.am
include src/compat/Makemodule.am
include src/common/Makemodule.am
if NEED_LIB
include src/libout123/Makemodule.am
if NEED_MAINLIB
@@ -20,19 +21,26 @@ bin_PROGRAMS += \
endif
endif
if NEED_LIB
if NEED_MAINLIB
# All main libraries need fmt123 header installed.
include_HEADERS += src/include/fmt123.h
endif
endif
src_mpg123_LDADD = \
src/compat/libcompat.la \
src/libmpg123/libmpg123.la \
src/libout123/libout123.la \
src/libsyn123/libsyn123.la \
$(LIBMPG123) \
$(LIBOUT123) \
$(LIBSYN123) \
@PROG_LIBS@
src_mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@
src_out123_LDADD = \
src/compat/libcompat.la \
src/libsyn123/libsyn123.la \
src/libout123/libout123.la \
$(LIBSYN123) \
$(LIBOUT123) \
@PROG_LIBS@
src_out123_LDFLAGS = @EXEC_LT_LDFLAGS@
@@ -46,12 +54,12 @@ CLEANFILES += src/*.a
src_mpg123_id3dump_LDADD = \
src/compat/libcompat.la \
src/libmpg123/libmpg123.la \
$(LIBMPG123) \
@PROG_LIBS@
src_mpg123_strip_LDADD = \
src/compat/libcompat.la \
src/libmpg123/libmpg123.la \
$(LIBMPG123) \
@PROG_LIBS@
src_mpg123_SOURCES = \

2
src/audio.c
View File

@@ -40,7 +40,7 @@
#include <sys/wait.h>
#endif
#include "debug.h"
#include "common/debug.h"
static syn123_handle *sh = NULL;
static struct mpg123_fmt outfmt = { .encoding=0, .rate=0, .channels=0 };

2
src/audio.h
View File

@@ -16,7 +16,7 @@
#ifndef _MPG123_AUDIO_H_
#define _MPG123_AUDIO_H_
#include "compat.h"
#include "compat/compat.h"
#include "mpg123.h"
#include "out123.h"

12
src/common.c
View File

@@ -1,7 +1,7 @@
/*
common: misc stuff... audio flush, status display...
copyright ?-2022 by the mpg123 project
copyright ?-2023 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
@@ -18,7 +18,7 @@
#include "terms.h"
#include "metaprint.h"
#include "debug.h"
#include "common/debug.h"
enum player_state playstate = STATE_PLAYING;
const char playsym[STATE_COUNT] = { '>', '_', '=', '?' };
@@ -320,12 +320,12 @@ void print_stat(mpg123_handle *fr, long offset, out123_handle *ao, int draw_bar
}
/* Taking pains to properly size the frame number fields. */
len = snprintf( framefmt, sizeof(framefmt)
, "%%0%d"OFF_P, (int)log10(frame+rframes)+1 );
, "%%0%d" PRIiMAX, (int)log10(frame+rframes)+1 );
if(len < 0 || len >= sizeof(framefmt))
memcpy(framefmt, "%05"OFF_P, sizeof("%05"OFF_P));
snprintf( framestr[0], sizeof(framestr[0])-1, framefmt, (off_p)frame);
memcpy(framefmt, "%05" PRIiMAX, sizeof("%05" PRIiMAX));
snprintf( framestr[0], sizeof(framestr[0])-1, framefmt, (intmax_t)frame);
framestr[0][sizeof(framestr[0])-1] = 0;
snprintf( framestr[1], sizeof(framestr[1])-1, framefmt, (off_p)rframes);
snprintf( framestr[1], sizeof(framestr[1])-1, framefmt, (intmax_t)rframes);
framestr[1][sizeof(framestr[1])-1] = 0;
/* Now start with the state line. */
memset(line, 0, linelen+1); /* Always one zero more. */

7
src/common/Makemodule.am Normal file
View File

@@ -0,0 +1,7 @@
# common headers shared between subprojects
EXTRA_DIST += \
src/common/abi_align.h \
src/common/debug.h \
src/common/sample.h \
src/common/swap_bytes_impl.h \
src/common/true.h

0
src/libmpg123/abi_align.h → src/common/abi_align.h
View File

0
src/libmpg123/debug.h → src/common/debug.h
View File

0
src/libmpg123/sample.h → src/common/sample.h
View File

0
src/libmpg123/swap_bytes_impl.h → src/common/swap_bytes_impl.h
View File

0
src/libmpg123/true.h → src/common/true.h
View File

2
src/compat/compat.c
View File

@@ -39,7 +39,7 @@
#include <shlwapi.h>
#endif
#include "debug.h"
#include "../common/debug.h"
#ifndef WINDOWS_UWP

49
src/compat/compat.h
View File

@@ -21,10 +21,8 @@
#include <errno.h>
#ifdef HAVE_STDLIB_H
/* realloc, size_t */
#include <stdlib.h>
#endif
#include <stddef.h>
@@ -48,16 +46,10 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
/* We want SIZE_MAX, etc. */
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
@@ -85,26 +77,11 @@
#define INT32_MIN (-INT32_MAX - 1)
#endif
#ifndef OFF_MAX
#undef OFF_MIN
#if SIZEOF_OFF_T == 4
#define OFF_MAX INT32_MAX
#define OFF_MIN INT32_MIN
#elif SIZEOF_OFF_T == 8
#define OFF_MAX INT64_MAX
#define OFF_MIN INT64_MIN
#else
#error "Unexpected width of off_t."
#endif
#endif
// Add two values (themselves assumed to be < limit), saturating to given limit.
#define SATURATE_ADD(inout, add, limit) inout = (limit-add >= inout) ? inout+add : limit;
#define SATURATE_SUB(inout, sub, limit) inout = (limit+sub >= inout) ? inout-sub : limit;
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
@@ -150,29 +127,6 @@ const char *INT123_strerror(int errnum);
and returns NULL on NULL input instead of crashing. */
char* INT123_compat_strdup(const char *s);
/* If we have the size checks enabled, try to derive some sane printfs.
Simple start: Use max integer type and format if long is not big enough.
I am hesitating to use %ll without making sure that it's there... */
#if (defined SIZEOF_OFF_T) && (SIZEOF_OFF_T > SIZEOF_LONG) && (defined PRIiMAX)
# define OFF_P PRIiMAX
typedef intmax_t off_p;
#else
# define OFF_P "li"
typedef long off_p;
#endif
#if (defined SIZEOF_SIZE_T) && (SIZEOF_SIZE_T > SIZEOF_LONG) && (defined PRIuMAX) && (defined PRIiMAX)
# define SIZE_P PRIuMAX
typedef uintmax_t size_p;
# define SSIZE_P PRIiMAX
typedef intmax_t ssize_p;
#else
# define SIZE_P "lu"
typedef unsigned long size_p;
# define SSIZE_P "ld"
typedef long ssize_p;
#endif
/* Get an environment variable, possibly converted to UTF-8 from wide string.
The return value is a copy that you shall free. */
char *INT123_compat_getenv(const char* name);
@@ -200,7 +154,6 @@ FILE* INT123_compat_fdopen(int fd, const char *mode);
int INT123_compat_close(int infd);
int INT123_compat_fclose(FILE* stream);
/**
* Setting binary mode on a descriptor, where necessary.
* We do not bother with errors. This has to work.
@@ -326,7 +279,7 @@ size_t INT123_unintr_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *st
#define normal mpg123_normal
#endif
#include "true.h"
#include "../common/true.h"
#if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H)
void (*INT123_catchsignal(int signum, void(*handler)(int)))(int);

2
src/compat/compat_dl.c
View File

@@ -47,7 +47,7 @@
# endif
#endif
#include "debug.h"
#include "../common/debug.h"
#include "wpathconv.h"

2
src/compat/compat_str.c
View File

@@ -26,7 +26,7 @@
#include <locale.h>
#endif
#include "debug.h"
#include "../common/debug.h"
/* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
void *INT123_safe_realloc(void *ptr, size_t size)

42
src/config.h.in
View File

@@ -133,9 +133,6 @@
/* Define to 1 if you have the `mx' library (-lmx). */
#undef HAVE_LIBMX
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if you have the <linux/soundcard.h> header file. */
#undef HAVE_LINUX_SOUNDCARD_H
@@ -458,21 +455,9 @@
/* Define for calculating tables at runtime. */
#undef RUNTIME_TABLES
/* The size of `int32_t', as computed by sizeof. */
#undef SIZEOF_INT32_T
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `off_t', as computed by sizeof. */
#undef SIZEOF_OFF_T
/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
/* The size of `ssize_t', as computed by sizeof. */
#undef SIZEOF_SSIZE_T
/* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
@@ -534,30 +519,3 @@
#ifndef __cplusplus
#undef inline
#endif
/* Define to `short' if <sys/types.h> does not define. */
#undef int16_t
/* Define to `int' if <sys/types.h> does not define. */
#undef int32_t
/* Define to `long long' if <sys/types.h> does not define. */
#undef int64_t
/* Define to `long' if <sys/types.h> does not define. */
#undef ptrdiff_t
/* Define to `unsigned long' if <sys/types.h> does not define. */
#undef size_t
/* Define to `long' if <sys/types.h> does not define. */
#undef ssize_t
/* Define to `unsigned short' if <sys/types.h> does not define. */
#undef uint16_t
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef uint32_t
/* Define to `unsigned long' if <sys/types.h> does not define. */
#undef uintptr_t

8
src/control_generic.c
View File

@@ -21,7 +21,7 @@
#ifndef _BSD_SOURCE
#define _BSD_SOURCE
#endif
#include "compat.h"
#include "compat/compat.h"
#include "mpg123app.h"
#include "out123.h"
@@ -60,7 +60,7 @@ static int mode = MODE_STOPPED;
static int init = 0;
static int sendstat_disabled = FALSE;
#include "debug.h"
#include "common/debug.h"
void generic_sendmsg (const char *fmt, ...)
{
@@ -175,7 +175,7 @@ void generic_sendstat (mpg123_handle *fr)
double current_seconds, seconds_left;
if(!position_info(fr, 0, ao, &current_frame, &frames_left, &current_seconds, &seconds_left, NULL, NULL))
generic_sendmsg("F %"OFF_P" %"OFF_P" %3.2f %3.2f", (off_p)current_frame, (off_p)frames_left, current_seconds, seconds_left);
generic_sendmsg("F %" PRIiMAX " %" PRIiMAX " %3.2f %3.2f", (intmax_t)current_frame, (intmax_t)frames_left, current_seconds, seconds_left);
else
{
sendstat_disabled = TRUE;
@@ -854,7 +854,7 @@ int control_generic (mpg123_handle *fr)
newpos = mpg123_tell(fr);
if(newpos <= oldpos) mpg123_meta_free(fr);
generic_sendmsg("K %"OFF_P, (off_p)newpos);
generic_sendmsg("K %" PRIiMAX, (intmax_t)newpos);
continue;
}
/* JUMP */

2
src/equalizer.c
View File

@@ -7,7 +7,7 @@
*/
#include "mpg123app.h"
#include "debug.h"
#include "common/debug.h"
/* Load the settings from the path in the global variable equalfile.
If there is no file, restore equalizer defaults.

2
src/filters.c
View File

@@ -9,7 +9,7 @@
#include "filters.h"
#include <ctype.h>
#include "debug.h"
#include "common/debug.h"
// Validate syntax of filter specification, returning the number
// of configured filters.

2
src/filters.h
View File

@@ -19,7 +19,7 @@
#ifndef MPG123_FILTERS_H
#define MPG123_FILTERS_H
#include "compat.h"
#include "compat/compat.h"
struct filter
{

4
src/getlopt.c
View File

@@ -8,9 +8,9 @@
*/
#include "config.h"
#include "compat.h"
#include "compat/compat.h"
#include "getlopt.h"
#include "debug.h"
#include "common/debug.h"
int loptind = 1; /* index in argv[] */
int loptchr = 0; /* index in argv[loptind] */

4
src/httpget.c
View File

@@ -34,12 +34,12 @@
#include "resolver.h"
#include <errno.h>
#include "true.h"
#include "common/true.h"
#endif
#include <ctype.h>
#include "debug.h"
#include "common/debug.h"
void httpdata_init(struct httpdata *e)
{

0
src/libmpg123/fmt123.h → src/include/fmt123.h
View File

2
src/libmpg123/mpg123.h → src/include/mpg123.h
View File

@@ -19,7 +19,7 @@
*/
#define MPG123_API_VERSION 48
/** library patch level at client build time */
#define MPG123_PATCHLEVEL 1
#define MPG123_PATCHLEVEL 2
#ifndef MPG123_EXPORT
/** Defines needed for MS Visual Studio(tm) DLL builds.

2
src/libout123/out123.h → src/include/out123.h
View File

@@ -20,7 +20,7 @@
*/
#define OUT123_API_VERSION 5
/** library patch level at client build time */
#define OUT123_PATCHLEVEL 0
#define OUT123_PATCHLEVEL 1
/* We only need size_t definition. */
#include <stddef.h>

2
src/libsyn123/syn123.h → src/include/syn123.h
View File

@@ -25,7 +25,7 @@
*/
#define SYN123_API_VERSION 2
/** library patch level at client build time */
#define SYN123_PATCHLEVEL 2
#define SYN123_PATCHLEVEL 3
#ifndef MPG123_EXPORT
/** Defines needed for MS Visual Studio(tm) DLL builds.

11
src/libmpg123/Makemodule.am
View File

@@ -20,10 +20,7 @@ src_libmpg123_calctables_LDADD = @LIBM@
if BUILD_LIBMPG123
lib_LTLIBRARIES += src/libmpg123/libmpg123.la
include_HEADERS += src/libmpg123/mpg123.h
endif
if NEED_FMT123
include_HEADERS += src/libmpg123/fmt123.h
include_HEADERS += src/include/mpg123.h
endif
src_libmpg123_libmpg123_la_CFLAGS = @LIB_CFLAGS@
@@ -39,18 +36,14 @@ src_libmpg123_libmpg123_la_DEPENDENCIES = \
src/compat/libcompat.la
src_libmpg123_libmpg123_la_SOURCES = \
src/libmpg123/fmt123.h \
src/libmpg123/mpeghead.h \
src/libmpg123/parse.c \
src/libmpg123/parse.h \
src/libmpg123/frame.c \
src/libmpg123/format.c \
src/libmpg123/swap_bytes_impl.h \
src/libmpg123/frame.h \
src/libmpg123/reader.h \
src/libmpg123/debug.h \
src/libmpg123/decode.h \
src/libmpg123/sample.h \
src/libmpg123/dct64.c \
src/libmpg123/synth.h \
src/libmpg123/synth_mono.h \
@@ -63,7 +56,6 @@ src_libmpg123_libmpg123_la_SOURCES = \
src/libmpg123/icy2utf8.h \
src/libmpg123/id3.h \
src/libmpg123/id3.c \
src/libmpg123/true.h \
src/libmpg123/getbits.h \
src/libmpg123/optimize.h \
src/libmpg123/optimize.c \
@@ -74,7 +66,6 @@ src_libmpg123_libmpg123_la_SOURCES = \
src/libmpg123/libmpg123.c \
src/libmpg123/gapless.h \
src/libmpg123/mpg123lib_intern.h \
src/libmpg123/abi_align.h \
src/libmpg123/mangle.h \
src/libmpg123/getcpuflags.h \
src/libmpg123/index.h \

2
src/libmpg123/calctables.c
View File

@@ -12,7 +12,7 @@
#define CALCTABLES
#include "mpg123lib_intern.h"
#include "debug.h"
#include "../common/debug.h"
#define ASIZE(a) (sizeof(a)/sizeof(*a))

17
src/libmpg123/decode.h
View File

@@ -203,16 +203,6 @@ void INT123_dct64_i386 (real *,real *,real *);
void INT123_dct64_altivec(real *,real *,real *);
void INT123_dct64_i486(int*, int* , real*); /* Yeah, of no use outside of synth_i486.c .*/
/* This is used by the layer 3 decoder, one generic function and 3DNow variants. */
void INT123_dct36 (real *,real *,real *,const real *,real *);
void INT123_dct36_3dnow (real *,real *,real *,const real *,real *);
void INT123_dct36_3dnowext(real *,real *,real *,const real *,real *);
void INT123_dct36_x86_64 (real *,real *,real *,const real *,real *);
void INT123_dct36_sse (real *,real *,real *,const real *,real *);
void INT123_dct36_avx (real *,real *,real *,const real *,real *);
void INT123_dct36_neon (real *,real *,real *,const real *,real *);
void INT123_dct36_neon64 (real *,real *,real *,const real *,real *);
/* Tools for NtoM resampling synth, defined in ntom.c . */
int INT123_synth_ntom_set_step(mpg123_handle *fr); /* prepare ntom decoding */
unsigned long INT123_ntom_val(mpg123_handle *fr, int64_t frame); /* compute INT123_ntom_val for frame offset */
@@ -232,6 +222,13 @@ int64_t INT123_ntom_frameoff(mpg123_handle *fr, int64_t soff);
/* Initialization of any static data that majy be needed at runtime.
Make sure you call these once before it is too late. */
#ifndef NO_LAYER3
#ifdef OPT_THE_DCT36
// Set the current dct36 function choice. The pointers themselves are to static functions.
void INT123_dct36_choose(mpg123_handle *fr);
int INT123_dct36_match(mpg123_handle *fr, enum optdec t);
#endif
#ifdef RUNTIME_TABLES
void INT123_init_layer3(void);
#endif

2
src/libmpg123/dither_impl.h
View File

@@ -7,7 +7,7 @@
*/
#include "config.h"
#include "compat.h"
#include "../compat/compat.h"
#include "dither.h"
static const uint32_t init_seed = 2463534242UL;

6
src/libmpg123/format.c
View File

@@ -26,8 +26,8 @@
*/
#include "mpg123lib_intern.h"
#include "sample.h"
#include "debug.h"
#include "../common/sample.h"
#include "../common/debug.h"
/* static int chans[NUM_CHANNELS] = { 1 , 2 }; */
static const long my_rates[MPG123_RATES] = /* only the standard rates */
@@ -686,7 +686,7 @@ static void conv_s16_to_s32(struct outbuffer *buf)
#endif
#endif
#include "swap_bytes_impl.h"
#include "../common/swap_bytes_impl.h"
void swap_endian(struct outbuffer *buf, int block)
{

9
src/libmpg123/frame.c
View File

@@ -9,7 +9,7 @@
#define WANT_GETCPUFLAGS
#include "mpg123lib_intern.h"
#include "getcpuflags.h"
#include "debug.h"
#include "../common/debug.h"
static void frame_fixed_reset(mpg123_handle *fr);
@@ -193,13 +193,12 @@ int INT123_frame_outbuffer(mpg123_handle *fr)
{
fr->err = MPG123_BAD_BUFFER;
if(NOQUIET)
merror( "have external buffer of size %"SIZE_P", need %"SIZE_P
, (size_p)fr->buffer.size, (size_p)size );
merror("have external buffer of size %zu, need %zu", fr->buffer.size, size);
return MPG123_ERR;
}
}
debug1("need frame buffer of %"SIZE_P, (size_p)size);
debug1("need frame buffer of %zu", size);
if(fr->buffer.rdata != NULL && fr->buffer.size != size)
{
free(fr->buffer.rdata);
@@ -222,7 +221,7 @@ int INT123_frame_outbuffer(mpg123_handle *fr)
int attribute_align_arg mpg123_replace_buffer(mpg123_handle *mh, void *data, size_t size)
{
debug2("replace buffer with %p size %"SIZE_P, data, (size_p)size);
debug2("replace buffer with %p size %zu", data, size);
if(mh == NULL) return MPG123_BAD_HANDLE;
/* Will accept any size, the error comes later... */
if(data == NULL)

4
src/libmpg123/frame.h
View File

@@ -167,11 +167,9 @@ struct mpg123_handle_struct
{
#ifdef OPT_MULTI
#ifndef NO_LAYER3
#if (defined OPT_3DNOW_VINTAGE || defined OPT_3DNOWEXT_VINTAGE || defined OPT_SSE || defined OPT_X86_64 || defined OPT_AVX || defined OPT_NEON || defined OPT_NEON64)
#ifdef OPT_THE_DCT36
void (*the_dct36)(real *,real *,real *,const real *,real *);
#endif
#endif
#endif
enum optdec type;

6
src/libmpg123/gapless.h
View File

@@ -7,7 +7,7 @@
This is no stand-alone header, precisely to be able to fool it into using fake handle types for testing the math.
*/
#include "debug.h"
#include "../common/debug.h"
#ifdef GAPLESS
/* From internal sample number to external. */
@@ -81,8 +81,8 @@ static void frame_buffercheck(mpg123_handle *fr)
}
if(VERBOSE3)
fprintf(stderr, "\nNote: Cut frame %" PRIi64 " buffer on end of stream to %"
PRIi64 " samples, fill now %"SIZE_P" bytes.\n"
, fr->num, (fr->num == fr->lastframe ? fr->lastoff : 0), (size_p)fr->buffer.fill);
PRIi64 " samples, fill now %zu bytes.\n"
, fr->num, (fr->num == fr->lastframe ? fr->lastoff : 0), fr->buffer.fill);
}
/* The first interesting frame: Skip some leading samples. */

2
src/libmpg123/getbits.h
View File

@@ -13,7 +13,7 @@
#define _MPG123_GETBITS_H_
#include "mpg123lib_intern.h"
#include "debug.h"
#include "../common/debug.h"
#define backbits(fr,nob) ((void)( \
fr->bits_avail += nob, \

2
src/libmpg123/icy.h
View File

@@ -10,7 +10,7 @@
#ifndef NO_ICY
#include "compat.h"
#include "../compat/compat.h"
#include "mpg123.h"
struct icy_meta

2
src/libmpg123/icy2utf8.c
View File

@@ -28,7 +28,7 @@
#include "config.h"
/* Includes string and stdlib headers... */
#include "compat.h"
#include "../compat/compat.h"
/* ThOr: too lazy for this type check; also we use char/short all around anyway.
Of cource, it would be the proper way to use _these_ kind of types all around. */

10
src/libmpg123/id3.c
View File

@@ -85,7 +85,7 @@
#include "mpg123lib_intern.h"
#include "id3.h"
#include "debug.h"
#include "../common/debug.h"
#ifndef NO_ID3V2 /* Only the main parsing routine will always be there. */
@@ -352,7 +352,7 @@ static void store_id3_text(mpg123_string *sb, unsigned char *source, size_t sour
}
memcpy(sb->p, source, source_size);
sb->fill = source_size;
debug1("stored undecoded ID3 text of size %"SIZE_P, (size_p)source_size);
debug1("stored undecoded ID3 text of size %zu", source_size);
return;
}
@@ -567,7 +567,7 @@ static void process_comment(mpg123_handle *fr, enum frame_types tt, unsigned cha
if(realsize < (size_t)(descr-realdata))
{
if(NOQUIET) error1("Invalid frame size of %"SIZE_P" (too small for anything).", (size_p)realsize);
if(NOQUIET) error1("Invalid frame size of %zu (too small for anything).", realsize);
return;
}
if(encoding > mpg123_id3_enc_max)
@@ -622,8 +622,8 @@ static void process_comment(mpg123_handle *fr, enum frame_types tt, unsigned cha
if(VERBOSE4) /* Do _not_ print the verbatim text: The encoding might be funny! */
{
fprintf(stderr, "Note: ID3 comm/uslt desc of length %"SIZE_P".\n", (size_p)xcom->description.fill);
fprintf(stderr, "Note: ID3 comm/uslt text of length %"SIZE_P".\n", (size_p)xcom->text.fill);
fprintf(stderr, "Note: ID3 comm/uslt desc of length %zu.\n", xcom->description.fill);
fprintf(stderr, "Note: ID3 comm/uslt text of length %zu.\n", xcom->text.fill);
}
/* Look out for RVA info only when we really deal with a straight comment. */
if(tt == comment && localcom.description.fill > 0)

4
src/libmpg123/index.c
View File

@@ -8,7 +8,7 @@
*/
#include "index.h"
#include "debug.h"
#include "../common/debug.h"
/* The next expected frame offset, one step ahead. */
static int64_t fi_next(struct frame_index *fi)
@@ -124,7 +124,7 @@ int INT123_fi_set(struct frame_index *fi, int64_t *offsets, int64_t step, size_t
void INT123_fi_reset(struct frame_index *fi)
{
debug1("reset with size %"SIZE_P, (size_p)fi->size);
debug1("reset with size %zu", fi->size);
fi->fill = 0;
fi->step = 1;
fi->next = fi_next(fi);

2
src/libmpg123/index.h
View File

@@ -21,7 +21,7 @@
*/
#include "config.h"
#include "compat.h"
#include "../compat/compat.h"
struct frame_index
{

2
src/libmpg123/layer1.c
View File

@@ -10,7 +10,7 @@
#include "mpg123lib_intern.h"
#include "getbits.h"
#include "debug.h"
#include "../common/debug.h"
/*
Allocation value is not allowed to be 15. Initially, libmad showed me the

114
src/libmpg123/layer3.c
View File

@@ -21,9 +21,17 @@
#include "huffman.h"
#endif
#include "getbits.h"
#include "debug.h"
#include "../common/debug.h"
/* Predeclare the assembly routines, only called from wrappers here. */
void INT123_dct36_3dnow (real *,real *,real *,const real *,real *);
void INT123_dct36_3dnowext(real *,real *,real *,const real *,real *);
void INT123_dct36_x86_64 (real *,real *,real *,const real *,real *);
void INT123_dct36_sse (real *,real *,real *,const real *,real *);
void INT123_dct36_avx (real *,real *,real *,const real *,real *);
void INT123_dct36_neon (real *,real *,real *,const real *,real *);
void INT123_dct36_neon64 (real *,real *,real *,const real *,real *);
/* define CUT_SFB21 if you want to cut-off the frequency above 16kHz */
#if 0
@@ -1256,10 +1264,7 @@ static void III_antialias(real xr[SBLIMIT][SSLIMIT],struct gr_info_s *gr_info)
Mathematics of Computation, Volume 32, Number 141, January 1978,
Pages 175-199
*/
/* Calculation of the inverse MDCT
used to be static without 3dnow - does that really matter? */
void INT123_dct36(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf)
static void INT123_dct36(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf)
{
real tmp[18];
@@ -1449,6 +1454,105 @@ void INT123_dct36(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf)
}
}
// Wrap the assembly routine calls into C functions that serve as jump target to satisfy
// indirect branch protection if the toolchain enables that. Otherwise, we'd need to anticipate
// that in the assembly (and ensure assemblers support endbr64 and friends).
// Loss of efficiency:
// In the case of one static optimization choice, we do not have that problem.
#ifdef OPT_THE_DCT36
#define DCT36_WRAP(asmfunc) \
static void asmfunc ## _wrap(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf) \
{ \
return asmfunc(inbuf, o1, o2, wintab, tsbuf); \
}
#ifdef OPT_SSE
DCT36_WRAP(INT123_dct36_sse)
#endif
#ifdef OPT_3DNOWEXT_VINTAGE
DCT36_WRAP(INT123_dct36_3dnowext)
#endif
#ifdef OPT_3DNOW_VINTAGE
DCT36_WRAP(INT123_dct36_3dnow)
#endif
#ifdef OPT_X86_64
DCT36_WRAP(INT123_dct36_x86_64)
#endif
#ifdef OPT_AVX
DCT36_WRAP(INT123_dct36_avx)
#endif
#ifdef OPT_NEON
DCT36_WRAP(INT123_dct36_neon)
#endif
#ifdef OPT_NEON64
DCT36_WRAP(INT123_dct36_neon64)
#endif
int INT123_dct36_match(mpg123_handle *fr, enum optdec t)
{
#ifdef OPT_SSE
if(t == sse && fr->cpu_opts.the_dct36 == INT123_dct36_sse_wrap)
return 1;
#endif
#ifdef OPT_3DNOWEXT_VINTAGE
if(t == dreidnowext_vintage && fr->cpu_opts.the_dct36 == INT123_dct36_3dnowext_wrap)
return 1;
#endif
#ifdef OPT_3DNOW_VINTAGE
if(t == dreidnow_vintage && fr->cpu_opts.the_dct36 == INT123_dct36_3dnow_wrap)
return 1;
#endif
return 0;
}
void INT123_dct36_choose(mpg123_handle *fr)
{
switch(fr->cpu_opts.type)
{
#ifdef OPT_SSE
case sse:
fr->cpu_opts.the_dct36 = INT123_dct36_sse_wrap;
break;
#endif
#ifdef OPT_3DNOWEXT_VINTAGE
case dreidnowext_vintage:
fr->cpu_opts.the_dct36 = INT123_dct36_3dnowext_wrap;
break;
#endif
#ifdef OPT_3DNOW_VINTAGE
case dreidnow_vintage:
fr->cpu_opts.the_dct36 = INT123_dct36_3dnow_wrap;
break;
#endif
#ifdef OPT_AVX
case avx:
fr->cpu_opts.the_dct36 = INT123_dct36_avx;
break;
#endif
#ifdef OPT_X86_64
case x86_64:
fr->cpu_opts.the_dct36 = INT123_dct36_x86_64;
break;
#endif
#ifdef OPT_NEON
case neon:
fr->cpu_opts.the_dct36 = INT123_dct36_neon;
break;
#endif
#ifdef OPT_NEON64
case neon:
fr->cpu_opts.the_dct36 = INT123_dct36_neon64;
break;
#endif
default:
fr->cpu_opts.the_dct36 = INT123_dct36;
}
}
#endif
/* new DCT12 */
static void dct12(real *in,real *rawout1,real *rawout2,register const real *wi,register real *ts)

21
src/libmpg123/lfs_wrap.c
View File

@@ -32,7 +32,7 @@
#endif
// For correct MPG123_EXPORT.
#include "abi_align.h"
#include "../common/abi_align.h"
// Need the full header with non-portable API, for the bare mpg123_open*()
// declarations. But no renaming shenanigans.
@@ -40,15 +40,28 @@
#include "mpg123.h"
#include "lfs_wrap.h"
#include "abi_align.h"
#include "compat.h"
#include "../common/abi_align.h"
#include "../compat/compat.h"
#include <sys/stat.h>
#include <fcntl.h>
#ifndef OFF_MAX
#undef OFF_MIN
#if SIZEOF_OFF_T == 4
#define OFF_MAX INT32_MAX
#define OFF_MIN INT32_MIN
#elif SIZEOF_OFF_T == 8
#define OFF_MAX INT64_MAX
#define OFF_MIN INT64_MIN
#else
#error "Unexpected width of off_t."
#endif
#endif
// A paranoid check that someone did not define a wrong SIZEOF_OFF_T at configure time.
typedef unsigned char MPG123_STATIC_ASSERT[(SIZEOF_OFF_T == sizeof(off_t)) ? 1 : -1];
#include "debug.h"
#include "../common/debug.h"
// We do not want to expose this publicly, but it is cleaner to have it also defined
// as portable API to offer the legacy function wrapper over. It's an undocumented

11
src/libmpg123/libmpg123.c
View File

@@ -7,19 +7,19 @@
*/
#include "mpg123lib_intern.h"
#include "version.h"
#include "../version.h"
#include "icy2utf8.h"
#include "gapless.h"
/* Want accurate rounding function regardless of decoder setup. */
#define FORCE_ACCURATE
#include "sample.h"
#include "../common/sample.h"
#include "parse.h"
#ifndef PORTABLE_API
#include "lfs_wrap.h"
#endif
#include "debug.h"
#include "../common/debug.h"
#define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe)
@@ -911,7 +911,8 @@ static void decode_the_frame(mpg123_handle *fr)
if(fr->buffer.fill < needed_bytes)
{
if(VERBOSE2)
fprintf(stderr, "Note: broken frame %li, filling up with %"SIZE_P" zeroes, from %"SIZE_P"\n", (long)fr->num, (size_p)(needed_bytes-fr->buffer.fill), (size_p)fr->buffer.fill);
fprintf( stderr, "Note: broken frame %li, filling up with %zu zeroes, from %zu\n"
, (long)fr->num, (needed_bytes-fr->buffer.fill), fr->buffer.fill );
/*
One could do a loop with individual samples instead... but zero is zero
@@ -931,7 +932,7 @@ static void decode_the_frame(mpg123_handle *fr)
else
{
if(NOQUIET)
error2("I got _more_ bytes than expected (%"SIZE_P" / %"SIZE_P"), that should not be possible!", (size_p)fr->buffer.fill, (size_p)needed_bytes);
error2("I got _more_ bytes than expected (%zu / %zu), that should not be possible!", fr->buffer.fill, needed_bytes);
}
}
#endif

12
src/libmpg123/mpg123lib_intern.h
View File

@@ -15,9 +15,9 @@
#include "config.h" /* Load this before _anything_ */
#include "abi_align.h"
#include "../common/abi_align.h"
#include "compat.h"
#include "../compat/compat.h"
// 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.
@@ -230,12 +230,6 @@ static inline int32_t scale_rounded(int32_t x, int shift)
#endif
#ifndef REAL_IS_FIXED
# if (defined SIZEOF_INT32_T) && (SIZEOF_INT32_T != 4)
# error "Bad 32bit types!!!"
# endif
#endif
#ifndef DOUBLE_TO_REAL
# define DOUBLE_TO_REAL(x) (real)(x)
#endif
@@ -284,7 +278,7 @@ static inline int32_t scale_rounded(int32_t x, int shift)
now: factor on minimum frame buffer size (which takes upsampling into account) */
#define AUDIOBUFSIZE 2
#include "true.h"
#include "../common/true.h"
#define MAX_NAME_SIZE 81
#define SBLIMIT 32

2
src/libmpg123/ntom.c
View File

@@ -8,7 +8,7 @@
#define SAFE_NTOM /* Do not depend on int64_t*int64_t with big values still being in the range... */
#include "mpg123lib_intern.h"
#include "debug.h"
#include "../common/debug.h"
int INT123_synth_ntom_set_step(mpg123_handle *fr)
{

56
src/libmpg123/optimize.c
View File

@@ -12,7 +12,7 @@
#define WANT_GETCPUFLAGS
#include "mpg123lib_intern.h" /* includes optimize.h */
#include "getcpuflags.h"
#include "debug.h"
#include "../common/debug.h"
/* Ugly macros to build conditional synth function array values. */
@@ -160,8 +160,8 @@ static enum optdec sse_or_vintage(mpg123_handle *fr)
enum optdec type;
type = sse_vintage;
# ifdef OPT_SSE
# ifdef OPT_MULTI
if(fr->cpu_opts.the_dct36 == INT123_dct36_sse)
# ifdef OPT_THE_DCT36
if(INT123_dct36_match(fr, sse))
# endif
type = sse;
# endif
@@ -192,7 +192,7 @@ static int find_dectype(mpg123_handle *fr)
type = dreidnowext;
# ifdef OPT_3DNOWEXT_VINTAGE
# ifdef OPT_MULTI
if(fr->cpu_opts.the_dct36 == INT123_dct36_3dnowext)
if(INT123_dct36_match(fr, dreidnowext_vintage))
# endif
type = dreidnowext_vintage;
# endif
@@ -210,7 +210,7 @@ static int find_dectype(mpg123_handle *fr)
type = dreidnow;
# ifdef OPT_3DNOW_VINTAGE
# ifdef OPT_MULTI
if(fr->cpu_opts.the_dct36 == INT123_dct36_3dnow)
if(INT123_dct36_match(fr, dreidnow_vintage))
# endif
type = dreidnow_vintage;
# endif
@@ -503,13 +503,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
#endif
fr->cpu_opts.type = nodec;
#ifdef OPT_MULTI
#ifndef NO_LAYER3
#if (defined OPT_3DNOW_VINTAGE || defined OPT_3DNOWEXT_VINTAGE || defined OPT_SSE || defined OPT_X86_64 || defined OPT_AVX || defined OPT_NEON || defined OPT_NEON64)
fr->cpu_opts.the_dct36 = INT123_dct36;
#endif
#endif
#endif
/* covers any i386+ cpu; they actually differ only in the INT123_synth_1to1 function, mostly... */
#ifdef OPT_X86
if(cpu_i586(fr->cpu_flags))
@@ -523,11 +516,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = dn_sse;
fr->cpu_opts.type = sse;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
/* if(cpu_fast_sse(fr->cpu_flags)) */ fr->cpu_opts.the_dct36 = INT123_dct36_sse;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_sse;
# ifdef ACCURATE_ROUNDING
@@ -590,11 +578,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = dn_dreidnowext_vintage;
fr->cpu_opts.type = dreidnowext_vintage;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
fr->cpu_opts.the_dct36 = INT123_dct36_3dnowext;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_3dnowext;
# endif
@@ -619,11 +602,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = dn_dreidnow_vintage;
fr->cpu_opts.type = dreidnow_vintage;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
fr->cpu_opts.the_dct36 = INT123_dct36_3dnow;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_3dnow;
# endif
@@ -723,11 +701,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = "x86-64 (AVX)";
fr->cpu_opts.type = avx;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
fr->cpu_opts.the_dct36 = INT123_dct36_avx;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_avx;
fr->synths.stereo[r_1to1][f_16] = INT123_synth_1to1_stereo_avx;
@@ -749,11 +722,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = "x86-64 (SSE)";
fr->cpu_opts.type = x86_64;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
fr->cpu_opts.the_dct36 = INT123_dct36_x86_64;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_x86_64;
fr->synths.stereo[r_1to1][f_16] = INT123_synth_1to1_stereo_x86_64;
@@ -796,11 +764,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = dn_neon;
fr->cpu_opts.type = neon;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
fr->cpu_opts.the_dct36 = INT123_dct36_neon;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_neon;
fr->synths.stereo[r_1to1][f_16] = INT123_synth_1to1_stereo_neon;
@@ -834,11 +797,6 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
{
chosen = dn_neon64;
fr->cpu_opts.type = neon64;
#ifdef OPT_MULTI
# ifndef NO_LAYER3
fr->cpu_opts.the_dct36 = INT123_dct36_neon64;
# endif
#endif
# ifndef NO_16BIT
fr->synths.plain[r_1to1][f_16] = INT123_synth_1to1_neon64;
fr->synths.stereo[r_1to1][f_16] = INT123_synth_1to1_stereo_neon64;
@@ -897,6 +855,10 @@ int INT123_frame_cpu_opt(mpg123_handle *fr, const char* cpu)
# endif
# endif
#ifdef OPT_THE_DCT36
INT123_dct36_choose(fr);
#endif
#ifdef OPT_DITHER
if(done && dithered)
{

9
src/libmpg123/optimize.h
View File

@@ -364,19 +364,16 @@ extern const int INT123_costab_mmxsse[];
#endif
#endif
/*
Now come two blocks of standard definitions for multi-decoder mode and single-decoder mode.
Most stuff is so automatic that it's indeed generated by some inline shell script.
Remember to use these scripts when possible, instead of direct repetitive hacking.
*/
#ifdef OPT_MULTI
# define defopt nodec
# ifndef NO_LAYER3
# if (defined OPT_3DNOW_VINTAGE || defined OPT_3DNOWEXT_VINTAGE || defined OPT_SSE || defined OPT_X86_64 || defined OPT_AVX || defined OPT_NEON || defined OPT_NEON64)
# define OPT_THE_DCT36
# define opt_dct36(fr) ((fr)->cpu_opts.the_dct36)
# endif
# endif
#endif /* OPT_MULTI else */

2
src/libmpg123/parse.c
View File

@@ -30,7 +30,7 @@
#include "mpeghead.h"
#include "debug.h"
#include "../common/debug.h"
#define bsbufid(fr) (fr)->bsbuf==(fr)->bsspace[0] ? 0 : ((fr)->bsbuf==fr->bsspace[1] ? 1 : ( (fr)->bsbuf==(fr)->bsspace[0]+512 ? 2 : ((fr)->bsbuf==fr->bsspace[1]+512 ? 3 : -1) ) )

4
src/libmpg123/readers.c
View File

@@ -11,7 +11,7 @@
#include "mpg123lib_intern.h"
#include "debug.h"
#include "../common/debug.h"
static int stream_init(mpg123_handle *fr);
static int64_t get_fileinfo(mpg123_handle *);
@@ -526,7 +526,7 @@ static struct buffy* bc_alloc(struct bufferchain *bc, size_t size)
buf->next = NULL; /* That shall be set to a sensible value later. */
buf->size = 0;
--bc->pool_fill;
debug2("bc_alloc: picked %p from pool (fill now %"SIZE_P")", (void*)buf, (size_p)bc->pool_fill);
debug2("bc_alloc: picked %p from pool (fill now %zu)", (void*)buf, bc->pool_fill);
return buf;
}
else return buffy_new(size, bc->bufblock);

4
src/libmpg123/stringbuf.c
View File

@@ -10,9 +10,9 @@
#include "mpg123lib_intern.h"
#include "config.h"
#include "mpg123.h"
#include "compat.h"
#include "../compat/compat.h"
#include <string.h>
#include "debug.h"
#include "../common/debug.h"
mpg123_string* attribute_align_arg mpg123_new_string(const char *val)
{

4
src/libmpg123/synth.c
View File

@@ -10,8 +10,8 @@
#ifdef OPT_GENERIC_DITHER
#define FORCE_ACCURATE
#endif
#include "sample.h"
#include "debug.h"
#include "../common/sample.h"
#include "../common/debug.h"
/*
Part 1: All synth functions that produce signed short.

4
src/libmpg123/synth_8bit.c
View File

@@ -7,8 +7,8 @@
*/
#include "mpg123lib_intern.h"
#include "sample.h"
#include "debug.h"
#include "../common/sample.h"
#include "../common/debug.h"
/*
Part 2: All synth functions that produce 8bit output.

4
src/libmpg123/synth_real.c
View File

@@ -7,8 +7,8 @@
*/
#include "mpg123lib_intern.h"
#include "sample.h"
#include "debug.h"
#include "../common/sample.h"
#include "../common/debug.h"
#ifdef REAL_IS_FIXED
#error "Do not build this file with fixed point math!"

4
src/libmpg123/synth_s32.c
View File

@@ -7,8 +7,8 @@
*/
#include "mpg123lib_intern.h"
#include "sample.h"
#include "debug.h"
#include "../common/sample.h"
#include "../common/debug.h"
#ifdef REAL_IS_FIXED
#error "Do not build this file with fixed point math!"

2
src/libmpg123/tabinit.c
View File

@@ -7,7 +7,7 @@
*/
#include "mpg123lib_intern.h"
#include "debug.h"
#include "../common/debug.h"
// The (normally precomputed) cos tables.
#include "costabs.h"

5
src/libout123/Makemodule.am
View File

@@ -7,10 +7,8 @@
# For dynamic modules.
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
include src/libout123/modules/Makemodule.am
endif
endif
if NEED_MAINLIB
if BUILD_LIBOUT123
@@ -20,7 +18,7 @@ if !HAVE_MODULES
include src/libout123/modules/Makemodule.am
endif
include_HEADERS += src/libout123/out123.h
include_HEADERS += src/include/out123.h
noinst_LTLIBRARIES += src/libout123/libmodule.la
@@ -30,7 +28,6 @@ endif
endif
src_libout123_libout123_la_SOURCES = \
src/libout123/out123.h \
src/libout123/libout123.c \
src/libout123/stringlists.h \
src/libout123/stringlists.c \

14
src/libout123/buffer.c
View File

@@ -1,7 +1,7 @@
/*
buffer.c: output buffer
copyright 1997-2015 by the mpg123 project - free software under the terms of the LGPL 2.1
copyright 1997-2023 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 Oliver Fromme
@@ -45,7 +45,7 @@
#endif
#endif
#include "debug.h"
#include "../common/debug.h"
#define BUF_CMD_OPEN XF_CMD_CUSTOM1
#define BUF_CMD_CLOSE XF_CMD_CUSTOM2
@@ -667,8 +667,8 @@ int buffer_loop(out123_handle *ao)
if(mystate == play_live)
{
size_t bytes = INT123_xfermem_get_usedspace(xf);
debug4( "Play or preload? Got %"SIZE_P" B / %"SIZE_P" B (%i,%i)."
, (size_p)bytes, (size_p)preload_size(ao), preloading, draining );
debug4( "Play or preload? Got %zu B / %zu B (%i,%i)."
, bytes, preload_size(ao), preloading, draining );
if(preloading)
preloading = (bytes < preload_size(ao));
if(!preloading)
@@ -860,8 +860,7 @@ int buffer_loop(out123_handle *ao)
int success;
blocksize = sizeof(*fmtlist)*fmtcount;
debug2("responding with %i formats (block: %"SIZE_P")"
, fmtcount, (size_p)blocksize);
debug2("responding with %i formats (block: %zu)", fmtcount, blocksize);
INT123_xfermem_putcmd(my_fd, XF_CMD_OK);
success =
GOOD_WRITEVAL(my_fd, fmtcount)
@@ -977,8 +976,7 @@ int buffer_loop(out123_handle *ao)
mystate = ao->state;
draining = FALSE;
}
debug2( "buffer drained %"SIZE_P" / %"SIZE_P
, oldfill-bytes, limit );
debug2("buffer drained %zu / %zu", oldfill-bytes, limit);
}
else
debug("drain without playback ... not good");

2
src/libout123/buffer.h
View File

@@ -17,7 +17,7 @@
#define _MPG123_BUFFER_H_
#include "out123_int.h"
#include "compat.h"
#include "../compat/compat.h"
int INT123_buffer_init(out123_handle *ao, size_t bytes);
void INT123_buffer_exit(out123_handle *ao);

2
src/libout123/hextxt.c
View File

@@ -19,7 +19,7 @@
#include "out123_int.h"
#include "hextxt.h"
#include "debug.h"
#include "../common/debug.h"
int hex_formats(out123_handle *ao)
{

2
src/libout123/legacy_module.c
View File

@@ -7,7 +7,7 @@
*/
#include "out123_int.h"
#include "debug.h"
#include "../common/debug.h"
/* A single module is staticly compiled in for each type */
extern mpg123_module_t mpg123_output_module_info;

18
src/libout123/libout123.c
View File

@@ -32,7 +32,7 @@
#endif
#endif
#include "version.h"
#include "../version.h"
#include "wav.h"
#include "hextxt.h"
#ifndef NOXFERMEM
@@ -44,7 +44,7 @@ static int have_buffer(out123_handle *ao)
#endif
#include "stringlists.h"
#include "debug.h"
#include "../common/debug.h"
const char * attribute_align_arg out123_distversion(unsigned int *major, unsigned int *minor, unsigned int *patch)
{
@@ -234,7 +234,7 @@ static int out123_seterr(out123_handle *ao, enum out123_error errcode)
int attribute_align_arg
out123_set_buffer(out123_handle *ao, size_t buffer_bytes)
{
debug2("out123_set_buffer(%p, %"SIZE_P")", (void*)ao, (size_p)buffer_bytes);
debug2("out123_set_buffer(%p, %zu)", (void*)ao, buffer_bytes);
if(!ao)
return OUT123_ERR;
ao->errcode = 0;
@@ -679,8 +679,8 @@ out123_play(out123_handle *ao, void *bytes, size_t count)
size_t sum = 0;
int written;
debug5( "[%ld]out123_play(%p, %p, %"SIZE_P") (%i)", (long)getpid()
, (void*)ao, bytes, (size_p)count, ao ? (int)ao->state : -1 );
debug5( "[%ld]out123_play(%p, %p, %zu) (%i)", (long)getpid()
, (void*)ao, bytes, count, ao ? (int)ao->state : -1 );
if(!ao)
return 0;
ao->errcode = 0;
@@ -748,8 +748,8 @@ out123_play(out123_handle *ao, void *bytes, size_t count)
}
} while(count && ao->flags & OUT123_KEEP_PLAYING);
}
debug3( "out123_play(%p, %p, ...) = %"SIZE_P
, (void*)ao, bytes, (size_p)sum );
debug3( "out123_play(%p, %p, ...) = %zu"
, (void*)ao, bytes, sum );
return sum;
}
@@ -800,7 +800,7 @@ void attribute_align_arg out123_drain(out123_handle *ao)
void attribute_align_arg out123_ndrain(out123_handle *ao, size_t bytes)
{
debug3("[%ld]out123_ndrain(%p, %"SIZE_P")", (long)getpid(), (void*)ao, (size_p)bytes);
debug3("[%ld]out123_ndrain(%p, %zu)", (long)getpid(), (void*)ao, bytes);
if(!ao)
return;
ao->errcode = 0;
@@ -1507,7 +1507,7 @@ size_t attribute_align_arg out123_buffered(out123_handle *ao)
if(have_buffer(ao))
{
size_t fill = INT123_buffer_fill(ao);
debug2("out123_buffered(%p) = %"SIZE_P, (void*)ao, (size_p)fill);
debug2("out123_buffered(%p) = %zu", (void*)ao, fill);
return fill;
}
else

4
src/libout123/module.c
View File

@@ -11,11 +11,11 @@
#define _BSD_SOURCE
#include "config.h"
#include "stringlists.h"
#include "compat.h"
#include "../compat/compat.h"
#include <errno.h>
#include "module.h"
#include "debug.h"
#include "../common/debug.h"
#ifndef USE_MODULES
#error This is a build without modules. Why am I here?

56
src/libout123/modules/Makemodule.am
View File

@@ -33,10 +33,12 @@ MODULE_CFLAGS= -shared
#pulse sdl sndio sun win32 win32_wasapi aix alib arts hp os2 \
#sgi mint openal \
#| tr ' ' '\n' |
#perl -ne 'chomp; $big = uc($_); print <<EOT;
#perl -ne 'chomp; $big = uc($_);
# @guard= $big ne "DUMMY" ? ("if BUILD_LIBOUT123_MODULES\n", "endif\n") : ("","");
# print <<EOT;
#
#if HAVE_MODULES
#if HAVE_$big
#$guard[0]if HAVE_$big
#pkglib_LTLIBRARIES += \src/libout123/modules/output_$_.la
#src_libout123_modules_output_${_}_la_SOURCES = \\
# src/libout123/modules/$_.c
@@ -49,7 +51,7 @@ MODULE_CFLAGS= -shared
# \$(AM_CPPFLAGS) \\
# \$(libout123_mod_cppflags)
#endif
#else
#$guard[1]else
#if BUILD_$big
#src_libout123_modules_libdefaultmodule_la_SOURCES = \\
# src/libout123/modules/$_.c
@@ -93,6 +95,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_TINYALSA
pkglib_LTLIBRARIES += src/libout123/modules/output_tinyalsa.la
src_libout123_modules_output_tinyalsa_la_SOURCES = \
@@ -106,6 +109,7 @@ src_libout123_modules_outout_tinyalsa_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_TINYALSA
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -120,6 +124,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_ALSA
pkglib_LTLIBRARIES += src/libout123/modules/output_alsa.la
src_libout123_modules_output_alsa_la_SOURCES = \
@@ -133,6 +138,7 @@ src_libout123_modules_outout_alsa_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_ALSA
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -147,6 +153,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_QSA
pkglib_LTLIBRARIES += src/libout123/modules/output_qsa.la
src_libout123_modules_output_qsa_la_SOURCES = \
@@ -160,6 +167,7 @@ src_libout123_modules_outout_qsa_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_QSA
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -174,6 +182,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_COREAUDIO
pkglib_LTLIBRARIES += src/libout123/modules/output_coreaudio.la
src_libout123_modules_output_coreaudio_la_SOURCES = \
@@ -187,6 +196,7 @@ src_libout123_modules_outout_coreaudio_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_COREAUDIO
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -201,6 +211,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_ESD
pkglib_LTLIBRARIES += src/libout123/modules/output_esd.la
src_libout123_modules_output_esd_la_SOURCES = \
@@ -214,6 +225,7 @@ src_libout123_modules_outout_esd_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_ESD
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -228,6 +240,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_JACK
pkglib_LTLIBRARIES += src/libout123/modules/output_jack.la
src_libout123_modules_output_jack_la_SOURCES = \
@@ -241,6 +254,7 @@ src_libout123_modules_outout_jack_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_JACK
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -255,6 +269,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_NAS
pkglib_LTLIBRARIES += src/libout123/modules/output_nas.la
src_libout123_modules_output_nas_la_SOURCES = \
@@ -268,6 +283,7 @@ src_libout123_modules_outout_nas_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_NAS
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -282,6 +298,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_OSS
pkglib_LTLIBRARIES += src/libout123/modules/output_oss.la
src_libout123_modules_output_oss_la_SOURCES = \
@@ -295,6 +312,7 @@ src_libout123_modules_outout_oss_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_OSS
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -309,6 +327,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_PORTAUDIO
pkglib_LTLIBRARIES += src/libout123/modules/output_portaudio.la
src_libout123_modules_output_portaudio_la_SOURCES = \
@@ -322,6 +341,7 @@ src_libout123_modules_outout_portaudio_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_PORTAUDIO
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -336,6 +356,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_PULSE
pkglib_LTLIBRARIES += src/libout123/modules/output_pulse.la
src_libout123_modules_output_pulse_la_SOURCES = \
@@ -349,6 +370,7 @@ src_libout123_modules_outout_pulse_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_PULSE
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -363,6 +385,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_SDL
pkglib_LTLIBRARIES += src/libout123/modules/output_sdl.la
src_libout123_modules_output_sdl_la_SOURCES = \
@@ -376,6 +399,7 @@ src_libout123_modules_outout_sdl_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_SDL
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -390,6 +414,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_SNDIO
pkglib_LTLIBRARIES += src/libout123/modules/output_sndio.la
src_libout123_modules_output_sndio_la_SOURCES = \
@@ -403,6 +428,7 @@ src_libout123_modules_outout_sndio_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_SNDIO
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -417,6 +443,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_SUN
pkglib_LTLIBRARIES += src/libout123/modules/output_sun.la
src_libout123_modules_output_sun_la_SOURCES = \
@@ -430,6 +457,7 @@ src_libout123_modules_outout_sun_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_SUN
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -444,6 +472,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_WIN32
pkglib_LTLIBRARIES += src/libout123/modules/output_win32.la
src_libout123_modules_output_win32_la_SOURCES = \
@@ -457,6 +486,7 @@ src_libout123_modules_outout_win32_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_WIN32
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -471,6 +501,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_WIN32_WASAPI
pkglib_LTLIBRARIES += src/libout123/modules/output_win32_wasapi.la
src_libout123_modules_output_win32_wasapi_la_SOURCES = \
@@ -484,6 +515,7 @@ src_libout123_modules_outout_win32_wasapi_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_WIN32_WASAPI
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -498,6 +530,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_AIX
pkglib_LTLIBRARIES += src/libout123/modules/output_aix.la
src_libout123_modules_output_aix_la_SOURCES = \
@@ -511,6 +544,7 @@ src_libout123_modules_outout_aix_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_AIX
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -525,6 +559,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_ALIB
pkglib_LTLIBRARIES += src/libout123/modules/output_alib.la
src_libout123_modules_output_alib_la_SOURCES = \
@@ -538,6 +573,7 @@ src_libout123_modules_outout_alib_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_ALIB
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -552,6 +588,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_ARTS
pkglib_LTLIBRARIES += src/libout123/modules/output_arts.la
src_libout123_modules_output_arts_la_SOURCES = \
@@ -565,6 +602,7 @@ src_libout123_modules_outout_arts_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_ARTS
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -579,6 +617,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_HP
pkglib_LTLIBRARIES += src/libout123/modules/output_hp.la
src_libout123_modules_output_hp_la_SOURCES = \
@@ -592,6 +631,7 @@ src_libout123_modules_outout_hp_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_HP
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -606,6 +646,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_OS2
pkglib_LTLIBRARIES += src/libout123/modules/output_os2.la
src_libout123_modules_output_os2_la_SOURCES = \
@@ -619,6 +660,7 @@ src_libout123_modules_outout_os2_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_OS2
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -633,6 +675,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_SGI
pkglib_LTLIBRARIES += src/libout123/modules/output_sgi.la
src_libout123_modules_output_sgi_la_SOURCES = \
@@ -646,6 +689,7 @@ src_libout123_modules_outout_sgi_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_SGI
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -660,6 +704,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_MINT
pkglib_LTLIBRARIES += src/libout123/modules/output_mint.la
src_libout123_modules_output_mint_la_SOURCES = \
@@ -673,6 +718,7 @@ src_libout123_modules_outout_mint_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_MINT
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -687,6 +733,7 @@ endif
endif
if HAVE_MODULES
if BUILD_LIBOUT123_MODULES
if HAVE_OPENAL
pkglib_LTLIBRARIES += src/libout123/modules/output_openal.la
src_libout123_modules_output_openal_la_SOURCES = \
@@ -700,6 +747,7 @@ src_libout123_modules_outout_openal_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libout123_mod_cppflags)
endif
endif
else
if BUILD_OPENAL
src_libout123_modules_libdefaultmodule_la_SOURCES = \
@@ -713,6 +761,7 @@ src_libout123_modules_libdefaultmodule_la_CPPFLAGS = \
endif
endif
if BUILD_LIBOUT123_OR_MODULES
if HAVE_MODULES
# Get rid of .la files, at least _after_ install.
install-exec-hook:
@@ -721,3 +770,4 @@ install-exec-hook:
uninstall-hook:
for m in @output_modules_la@; do eval $$(grep dlname= src/libout123/modules/$$m) && rm -f $(DESTDIR)$(pkglibdir)/$$dlname; done
endif
endif

4
src/libout123/modules/aix.c
View File

@@ -8,7 +8,7 @@
untested since quite some years now ...
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <stdio.h>
#include <unistd.h>
@@ -23,7 +23,7 @@
#include <sys/stat.h>
#include <sys/param.h>
#include "debug.h"
#include "../../common/debug.h"
/* use AUDIO_BSIZE to set the msec for audio buffering in Ultimedia library
*/

4
src/libout123/modules/alib.c
View File

@@ -30,7 +30,7 @@
/**************************************************************************/
#include "out123_int.h"
#include "../out123_int.h"
#include <fcntl.h>
@@ -44,7 +44,7 @@
#include <Alib.h> /* /opt/audio/include */
#include <CUlib.h> /* /opt/audio/include */
#include "debug.h"
#include "../../common/debug.h"
/**************************************************************************/

4
src/libout123/modules/alsa.c
View File

@@ -17,7 +17,7 @@
/* Things are still missing if _DEFAULT_SOURCE is not defined (for recent
glibc, I presume. */
#define _DEFAULT_SOURCE
#include "out123_int.h"
#include "../out123_int.h"
#include <errno.h>
/* make ALSA 0.9.x compatible to the 1.0.x API */
@@ -27,7 +27,7 @@
#include <alloca.h> /* GCC complains about missing declaration of alloca. */
#include <alsa/asoundlib.h>
#include "debug.h"
#include "../../common/debug.h"
/* Total buffer size in seconds, 0.2 is more true to what ALSA maximally uses
here (8192 samples). The earlier default of 0.5 was never true. */

4
src/libout123/modules/arts.c
View File

@@ -8,9 +8,9 @@
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <artsc.h>
#include "debug.h"
#include "../../common/debug.h"
typedef struct
{

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

@@ -9,7 +9,7 @@
*/
#include "out123_int.h"
#include "../out123_int.h"
/* has been around since at least 10.4 */
#include <AvailabilityMacros.h>
@@ -44,9 +44,9 @@
/* Including the sfifo code locally, to avoid module linkage issues. */
#define SFIFO_STATIC
#include "sfifo.c"
#include "../sfifo.c"
#include "debug.h"
#include "../../common/debug.h"
/* Duration of the ring buffer in seconds.
Is that all that there is to tunable latency?

4
src/libout123/modules/dummy.c
View File

@@ -5,8 +5,8 @@
see COPYING and AUTHORS files in distribution or http://mpg123.org
*/
#include "out123_int.h"
#include "debug.h"
#include "../out123_int.h"
#include "../../common/debug.h"
static int open_dummy(out123_handle *ao)
{

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

@@ -8,7 +8,7 @@
/* First the common header, including config.h
...this is important for stuff like _FILE_OFFSET_BITS */
#include "out123_int.h"
#include "../out123_int.h"
#include <esd.h>
#include <errno.h>
@@ -22,7 +22,7 @@
#include <sys/ioctl.h>
#include <sys/audioio.h>
#endif
#include "debug.h"
#include "../../common/debug.h"
static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0;
@@ -162,7 +162,7 @@ mpg123_module_t mpg123_output_module_info = {
/* api_version */ MPG123_MODULE_API_VERSION,
/* name */ "esd",
/* description */ "Output audio using ESounD (The Enlightened Sound Daemon).",
/* revision */ "$Rev: 3915 $",
/* revision */ "$Rev: 5386 $",
/* handle */ NULL,
/* init_output */ init_esound,

4
src/libout123/modules/hp.c
View File

@@ -6,10 +6,10 @@
initially written by Michael Hipp
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <fcntl.h>
#include <sys/audio.h>
#include "debug.h"
#include "../../common/debug.h"
static int set_rate(out123_handle *ao)

21
src/libout123/modules/jack.c
View File

@@ -1,7 +1,7 @@
/*
jack: audio output via JACK Audio Connection Kit
copyright 2006-2016 by the mpg123 project - free software under the terms of the LGPL 2.1
copyright 2006-2023 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 Nicholas J. Humfrey
@@ -14,7 +14,7 @@
There's always a deadlock. --ThOr
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <math.h>
@@ -26,7 +26,7 @@
#include <semaphore.h>
#include <sys/errno.h>
#include "debug.h"
#include "../../common/debug.h"
typedef struct {
int alive;
@@ -147,8 +147,7 @@ static int process_callback( jack_nframes_t nframes, void *arg )
got_piece = jack_ringbuffer_read( handle->rb
, handle->procbuf, (avail_piece > piece ? piece : avail_piece)
* handle->framesize ) / handle->framesize;
debug2( "fetched %"SIZE_P" frames from ringbuffer (wanted %"SIZE_P")"
, (size_p)got_piece, (size_p)piece );
debug2("fetched %zu frames from ringbuffer (wanted %zu)", got_piece, piece);
/* If this is the last piece, fill up, not time to wait. */
if(to_read > piece)
piece = got_piece; /* We got further loop cycle(s) to get the rest. */
@@ -326,7 +325,7 @@ static int connect_jack_ports(out123_handle *ao
for(c=0;c<wish_channels;++c)
{
while(devcopy[i] != 0 && devcopy[i] != ',') ++i;
debug2("devcopy[%"SIZE_P"]=%i", i, devcopy[i]);
debug2("devcopy[%zu]=%i", i, devcopy[i]);
if(devcopy[i] == ',')
{
/* Terminate previous port name, assign next one. */
@@ -362,9 +361,9 @@ static void drain_jack(out123_handle *ao)
while( handle && handle->alive && handle->rb
&& jack_ringbuffer_write_space(handle->rb)+1 < handle->rb_size )
{
debug2( "JACK close wait %"SIZE_P" < %"SIZE_P"\n"
, (size_p)jack_ringbuffer_write_space(handle->rb)
, (size_p)handle->rb_size );
debug2( "JACK close wait %zu < %zu\n"
, jack_ringbuffer_write_space(handle->rb)
, handle->rb_size );
sem_wait(&handle->sem);
}
}
@@ -486,7 +485,7 @@ static int open_jack(out123_handle *ao)
handle->procbuf_frames = jack_get_buffer_size(handle->client);
if(handle->rb_size < 2*handle->procbuf_frames)
handle->rb_size = 2*handle->procbuf_frames;
debug1("JACK ringbuffer for %"SIZE_P" PCM frames", (size_p)handle->rb_size);
debug1("JACK ringbuffer for %zu PCM frames", handle->rb_size);
/* Convert to bytes. */
handle->rb_size *= handle->framesize;
handle->rb = jack_ringbuffer_create(handle->rb_size);
@@ -553,7 +552,7 @@ static int write_jack(out123_handle *ao, unsigned char *buf, int len)
debug("writing to ringbuffer");
/* No help: piece1 = jack_ringbuffer_write_space(handle->rb); */
piece = jack_ringbuffer_write(handle->rb, (char*)buf, bytes_left);
debug1("wrote %"SIZE_P" B", (size_p)piece);
debug1("wrote %zu B", piece);
buf += piece;
bytes_left -= piece;
/* Allow nothing being written some times, but not too often.

4
src/libout123/modules/mint.c
View File

@@ -6,13 +6,13 @@
initially written by Petr Stehlik
*/
#include "out123_int.h"
#include "../out123_int.h"
/* derived from LINUX, VOXWARE and SUN for MiNT Audio Device by Petr Stehlik */
#include <fcntl.h>
#include <ioctl.h>
#include <audios.h>
#include "debug.h"
#include "../../common/debug.h"
/* Globals */
/* extern int outburst; */

4
src/libout123/modules/nas.c
View File

@@ -6,11 +6,11 @@
initially written by Martin Denn
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <fcntl.h>
#include <audio/audiolib.h>
#include <audio/soundlib.h>
#include "debug.h"
#include "../../common/debug.h"
typedef struct
{

4
src/libout123/modules/openal.c
View File

@@ -10,7 +10,7 @@
#define _DEFAULT_SOURCE
#define _BSD_SOURCE
#include "out123_int.h"
#include "../out123_int.h"
#ifdef OPENAL_SUBDIR_OPENAL
#include <OpenAL/al.h>
@@ -25,7 +25,7 @@
#include <errno.h>
#include <unistd.h>
#include "debug.h"
#include "../../common/debug.h"
#define NUM_BUFFERS 16

4
src/libout123/modules/os2.c
View File

@@ -6,7 +6,7 @@
initially written by Samuel Audet
*/
#include "out123_int.h"
#include "../out123_int.h"
#undef VERSION /* The VERSION macro conflicts with the OS/2 multimedia headers */
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <ctype.h>
#include "debug.h"
#include "../../common/debug.h"
// Only one instance at a time! This all needs to go into userptr!
static BOOL opened = FALSE;

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

@@ -6,7 +6,7 @@
initially written by Michael Hipp
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <sys/ioctl.h>
#include <fcntl.h>
@@ -39,7 +39,7 @@
# endif
#endif
#include "debug.h"
#include "../../common/debug.h"
struct oss_stuff
{
@@ -312,7 +312,7 @@ mpg123_module_t mpg123_output_module_info = {
/* api_version */ MPG123_MODULE_API_VERSION,
/* name */ "oss",
/* description */ "Output audio using OSS",
/* revision */ "$Rev: 4021 $",
/* revision */ "$Rev: 5386 $",
/* handle */ NULL,
/* init_output */ init_oss,

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

@@ -9,7 +9,7 @@
/* Need usleep(). */
#define _DEFAULT_SOURCE
#define _BSD_SOURCE
#include "out123_int.h"
#include "../out123_int.h"
#include <math.h>
#include <portaudio.h>
@@ -19,9 +19,9 @@
/* Including the sfifo code locally, to avoid module linkage issues. */
#define SFIFO_STATIC
#include "sfifo.c"
#include "../sfifo.c"
#include "debug.h"
#include "../../common/debug.h"
#define SAMPLE_SIZE (2)
#define FRAMES_PER_BUFFER (256)

4
src/libout123/modules/pulse.c
View File

@@ -6,7 +6,7 @@
initially written by Nicholas J. Humfrey
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <stdlib.h>
#include <stdio.h>
@@ -19,7 +19,7 @@
#include <pulse/error.h>
#include <pulse/pulseaudio.h>
#include "debug.h"
#include "../../common/debug.h"
// Since we learned the async API for enumeration, let's abuse it for
// a simple check if a pulse server is active before accidentally

4
src/libout123/modules/qsa.c
View File

@@ -7,13 +7,13 @@
written by Mike Gorchak <mike.gorchak.qnx@gmail.com>
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <errno.h>
#include <stdint.h>
#include <sys/asoundlib.h>
#include "debug.h"
#include "../../common/debug.h"
typedef struct _qsa_mp_map
{

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

@@ -10,7 +10,7 @@
#define _XOPEN_SOURCE 500
#define _DEFAULT_SOURCE
#include "out123_int.h"
#include "../out123_int.h"
#include <math.h>
#include <SDL.h>
@@ -21,9 +21,9 @@
/* Including the sfifo code locally, to avoid module linkage issues. */
#define SFIFO_STATIC
#include "sfifo.c"
#include "../sfifo.c"
#include "debug.h"
#include "../../common/debug.h"
#define SAMPLE_SIZE (2)

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

@@ -6,11 +6,11 @@
initially written (as it seems) by Thomas Woerner
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <fcntl.h>
#include <dmedia/audio.h>
#include "errno.h"
#include "debug.h"
#include <errno.h>
#include "../../common/debug.h"
static int set_rate(out123_handle *ao, ALconfig config)
{

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

@@ -17,11 +17,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <sndio.h>
#include "debug.h"
#include "../../common/debug.h"
static int sndio_to_mpg123_enc(int sign, int bits)
{

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

@@ -6,7 +6,7 @@
initially written by Michael Hipp
*/
#include "out123_int.h"
#include "../out123_int.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
@@ -29,7 +29,7 @@
#endif
#include <fcntl.h>
#include "debug.h"
#include "../../common/debug.h"
static void set_format_helper(out123_handle *ao, audio_info_t *ainfo)
{
@@ -274,7 +274,7 @@ mpg123_module_t mpg123_output_module_info = {
/* api_version */ MPG123_MODULE_API_VERSION,
/* name */ "sun",
/* description */ "Audio output for Sun Audio.",
/* revision */ "$Rev: 4625 $",
/* revision */ "$Rev: 5386 $",
/* handle */ NULL,
/* init_output */ init_sun,

4
src/libout123/modules/tinyalsa.c
View File

@@ -7,12 +7,12 @@
initially written by Jarno Lehtinen <lehtinen@sci.fi>
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <errno.h>
#include <tinyalsa/asoundlib.h>
#include "debug.h"
#include "../../common/debug.h"
typedef struct

4
src/libout123/modules/win32.c
View File

@@ -9,9 +9,9 @@
Closing buffer playback fixed by David Wohlferd <limegreensocks (*) yahoo dod com>
*/
#include "out123_int.h"
#include "../out123_int.h"
#include <windows.h>
#include "debug.h"
#include "../../common/debug.h"
/*
Buffer size and number of buffers in the playback ring

4
src/libout123/modules/win32_wasapi.c
View File

@@ -14,14 +14,14 @@
# define _WIN32_WINNT 0x0601
#endif
#define COBJMACROS 1
#include "out123_int.h"
#include "../out123_int.h"
#include <inttypes.h>
#include <initguid.h>
#include <audioclient.h>
#include <mmdeviceapi.h>
#include <avrt.h>
#include <functiondiscoverykeys_devpkey.h>
#include "debug.h"
#include "../../common/debug.h"
#ifdef _MSC_VER

4
src/libout123/out123_int.h
View File

@@ -12,8 +12,8 @@
#define MPG123_ENUM_API
#include "config.h"
#include "abi_align.h"
#include "compat.h"
#include "../common/abi_align.h"
#include "../compat/compat.h"
#include "out123.h"
#include "module.h"

2
src/libout123/sfifo.c
View File

@@ -19,7 +19,7 @@ TODO:
#include <stdlib.h>
#include "sfifo.h"
#include "debug.h"
#include "../common/debug.h"
/*
* Alloc buffer, init FIFO etc...

2
src/libout123/stringlists.c
View File

@@ -10,7 +10,7 @@
functions just for returning driver module lists.
*/
#include "compat.h"
#include "../compat/compat.h"
#include "out123.h"
static char* always_strdup(const char *in)

2
src/libout123/wav.c
View File

@@ -28,7 +28,7 @@
#include "wav.h"
#include <errno.h>
#include "debug.h"
#include "../common/debug.h"
/* Create the two WAV headers. */

4
src/libout123/xfermem.c
View File

@@ -10,7 +10,7 @@
*/
#include "config.h"
#include "compat.h"
#include "../compat/compat.h"
#include "xfermem.h"
#include <string.h>
#include <errno.h>
@@ -24,7 +24,7 @@
#include <sys/shm.h>
#endif
#include "debug.h"
#include "../common/debug.h"
#if defined (HAVE_MMAP) && defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
#define MAP_ANON MAP_ANONYMOUS

2
src/libout123/xfermem.h
View File

@@ -20,7 +20,7 @@
#ifndef _XFERMEM_H_
#define _XFERMEM_H_
#include "compat.h"
#include "../compat/compat.h"
typedef struct {
size_t freeindex; /* [W] next free index */

3
src/libsyn123/Makemodule.am
View File

@@ -4,7 +4,7 @@
# and format conversion for the mpg123 project.
if BUILD_LIBSYN123
include_HEADERS += src/libsyn123/syn123.h
include_HEADERS += src/include/syn123.h
lib_LTLIBRARIES += src/libsyn123/libsyn123.la
endif
@@ -21,7 +21,6 @@ src_libsyn123_libsyn123_la_LIBADD = \
@LIBSYN123_LIBS@
src_libsyn123_libsyn123_la_SOURCES = \
src/libsyn123/syn123.h \
src/libsyn123/syn123_int.h \
src/libsyn123/g711_impl.h \
src/libsyn123/pinknoise.c \

21
src/libsyn123/libsyn123.c
View File

@@ -1,7 +1,7 @@
/*
libsyn123: libsyn123 entry code and wave generators
copyright 2017-2018 by the mpg123 project
copyright 2017-2023 by the mpg123 project
licensed under the terms of the LGPL 2.1
see COPYING and AUTHORS files in distribution or http://mpg123.org
@@ -20,9 +20,9 @@
*/
#include "syn123_int.h"
#include "version.h"
#include "sample.h"
#include "debug.h"
#include "../version.h"
#include "../common/sample.h"
#include "../common/debug.h"
const char * attribute_align_arg syn123_distversion(unsigned int *major, unsigned int *minor, unsigned int *patch)
{
@@ -96,7 +96,7 @@ static double common_samples_per_period( long rate, size_t count
)
periods++;
spp*=periods;
debug3( "samples_per_period + %f Hz = %g (%" SIZE_P " periods)"
debug3( "samples_per_period + %f Hz = %g (%zu periods)"
, waves[i].freq, spp, periods );
}
return spp;
@@ -127,7 +127,7 @@ static size_t tablesize( long rate, size_t count
/* Ensure size limit. Even it is ridiculous. */
ts = smin(ts, size_limit);
debug1("table size: %" SIZE_P, ts);
debug1("table size: %zu", ts);
return ts;
}
@@ -336,7 +336,7 @@ static void wave_fit_table( size_t samples
, long rate, struct syn123_wave *wave )
{
double pps = wave->freq/rate;
debug3("wave_fit_table %" SIZE_P " %ld %g", samples, rate, wave->freq);
debug3("wave_fit_table %zu %ld %g", samples, rate, wave->freq);
size_t periods = smax(round2size(pps*samples), 1);
pps = (double)periods/samples;
wave->freq = pps*rate;
@@ -350,7 +350,7 @@ static void wave_add_buffer( double outbuf[bufblock], size_t samples
, long rate, struct syn123_wave *wave, double workbuf[bufblock] )
{
double pps = wave->freq/rate;
debug3("wave_add_buffer %" SIZE_P " %ld %g", samples, rate, wave->freq);
debug3("wave_add_buffer %zu %ld %g", samples, rate, wave->freq);
debug4( "adding wave: %c %i @ %g Hz + %g"
, wave->backwards ? '<' : '>', wave->id, wave->freq, wave->phase );
if(wave->backwards)
@@ -875,8 +875,7 @@ syn123_read( syn123_handle *sh, void *dest, size_t dest_bytes )
while(dest_samples)
{
size_t block = smin(dest_samples, sh->samples - sh->offset);
debug3( "offset: %"SIZE_P" block: %" SIZE_P" out of %"SIZE_P
, sh->offset, block, sh->samples );
debug3("offset: %zu block: %zu out of %zu", sh->offset, block, sh->samples);
syn123_mono2many(cdest, (char*)sh->buf+sh->offset*samplesize
, sh->fmt.channels, samplesize, block );
cdest += framesize*block;
@@ -918,7 +917,7 @@ syn123_read( syn123_handle *sh, void *dest, size_t dest_bytes )
extracted += block;
}
}
debug1("extracted: %" SIZE_P, extracted);
debug1("extracted: %zu", extracted);
return extracted*framesize;
}

8
src/libsyn123/resample.c
View File

@@ -1,7 +1,7 @@
/*
resample: low-latency usable and quick resampler
copyright 2018-2020 by the mpg123 project
copyright 2018-2023 by the mpg123 project
licensed under the terms of the LGPL 2.1
see COPYING and AUTHORS files in distribution or http://mpg123.org
@@ -82,7 +82,7 @@ TODO: initialize with first sample or zero? is there an actual benefit? impulse
// SSIZE_MAX is not standard C:-/
#define _POSIX_C_SOURCE 200809L
#include "syn123_int.h"
#include "debug.h"
#include "../common/debug.h"
// coefficient tables generated from coeff-ellip-6-0.01-36-16.txd
// (coeff-{filter_type}-{order}-{passband_ripple}-{rejection_dB}-{points})
@@ -2586,7 +2586,7 @@ syn123_resample( syn123_handle *sh,
// Input limit is zero if no resampler configured.
if(!samples || samples > sh->rd->input_limit)
return 0;
mdebug( "calling actual resample function from %p to %p with %"SIZE_P" samples"
, (void*)src, (void*)dst, (size_p)samples );
mdebug( "calling actual resample function from %p to %p with %zu samples"
, (void*)src, (void*)dst, samples );
return rd->resample_func(rd, src, samples, dst);
}

6
src/libsyn123/sampleconv.c
View File

@@ -19,8 +19,8 @@
#define NO_SMAX
#define RAND_XORSHIFT32
#include "syn123_int.h"
#include "sample.h"
#include "debug.h"
#include "../common/sample.h"
#include "../common/debug.h"
// Avoid conflict with pragmas in isnan() and friends.
#undef warning
@@ -988,7 +988,7 @@ mix_end:
/* All the byte-swappery for those little big endian boxes. */
#include "swap_bytes_impl.h"
#include "../common/swap_bytes_impl.h"
void attribute_align_arg
syn123_swap_bytes(void* buf, size_t samplesize, size_t samplecount)

4
src/libsyn123/syn123_int.h
View File

@@ -17,8 +17,8 @@
#ifdef LFS_LARGEFILE_64
#define _LARGEFILE64_SOURCE
#endif
#include "abi_align.h"
#include "compat.h"
#include "../common/abi_align.h"
#include "../compat/compat.h"
#define SYN123_NO_LARGEFUNC
#include "syn123.h"

2
src/libsyn123/volume.c
View File

@@ -11,7 +11,7 @@
#define NO_GROW_BUF
#define NO_SMAX
#include "syn123_int.h"
#include "debug.h"
#include "../common/debug.h"
// Avoid conflict with pragmas in isnan() and friends.
#undef warning

4
src/local.c
View File

@@ -22,7 +22,7 @@
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif
#include "compat.h"
#include "compat/compat.h"
#include "local.h"
@@ -39,7 +39,7 @@
#include <wincon.h>
#endif
#include "debug.h"
#include "common/debug.h"
int utf8force = 0; // enforce UTF-8 workings
int utf8env = 0; // produce UTF-8 text output

Some files were not shown because too many files have changed in this diff Show More