mpg123-1.32.4

Makefile.am

@@ -31,29 +31,26 @@ XFAIL_TESTS =
 check_PROGRAMS =
 
 AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\""
-# That can be trimmed down later when adapting the sources to
+AM_CPPFLAGS += $(LTDLINCL)
-# use relative paths for includes.
+
-# Watch out for generated headers (that's why top_builddir is also present).
+# Central place defining the mpg123 libraries to be used. You could
-AM_CPPFLAGS += \
+# put -lmpg123 in here to use an external one (for whatever reason).
-  $(LTDLINCL) \
+LIBMPG123 = src/libmpg123/libmpg123.la
-  -I$(top_srcdir)/src \
+LIBOUT123 = src/libout123/libout123.la
-  -I$(top_srcdir)/src/compat \
+LIBSYN123 = src/libsyn123/libsyn123.la
-  -I$(top_srcdir)/src/libmpg123 \
-  -I$(top_srcdir)/src/libsyn123 \
-  -I$(top_srcdir)/src/libout123 \
-  -I$(top_builddir)/src/libmpg123 \
-  -I$(top_builddir)/src/libsyn123 \
-  -I$(top_builddir)/src/libout123
 
 # Include Make modules from subdirectories.
 include src/Makemodule.am
 include doc/Makemodule.am
 
+# Always use our set of API headers.
+AM_CPPFLAGS+= -I$(top_srcdir)/src/include
+
 if NEED_MAINLIB
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 
 
-# Stuff from this directory.
+# Pkg-config files and library includes.
 if BUILD_LIBMPG123
 pkgconfig_DATA += libmpg123.pc
 endif
@@ -71,6 +68,7 @@ endif
 
 # mpg123.spec is autogenerated but needs to be present in tarball!
 EXTRA_DIST += \
+  test_c99.c \
   mpg123.spec \
   makedll.sh \
   windows-builds.sh \

Makefile.in

@@ -174,10 +174,12 @@ check_PROGRAMS = $(am__EXEEXT_5)
 #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
@@ -190,7 +192,7 @@ check_PROGRAMS = $(am__EXEEXT_5)
 #  \$(AM_CPPFLAGS) \\
 #  \$(libout123_mod_cppflags)
 #endif
-#else
+#$guard[1]else
 #if BUILD_$big
 #src_libout123_modules_libdefaultmodule_la_SOURCES  = \\
 #  src/libout123/modules/$_.c
@@ -204,7 +206,7 @@ check_PROGRAMS = $(am__EXEEXT_5)
 #endif
 #EOT
 #'
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_6 = src/libout123/modules/output_dummy.la
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_6 = src/libout123/modules/output_dummy.la
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@@NEED_LIB_TRUE@am__append_7 = src/libout123/modules/output_tinyalsa.la
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_ALSA_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am__append_8 = src/libout123/modules/output_alsa.la
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_QSA_TRUE@@NEED_LIB_TRUE@am__append_9 = src/libout123/modules/output_qsa.la
@@ -235,7 +237,7 @@ check_PROGRAMS = $(am__EXEEXT_5)
 # For dynamic modules.
 
 # Just for libdefaultmodule.la.
-@BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_31 = src/libout123/out123.h
+@BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_31 = src/include/out123.h
 @BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_32 = src/libout123/libmodule.la
 @BUILD_LIBOUT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_33 = src/libout123/libout123.la
 @BUILD_BUFFER_TRUE@@NEED_LIB_TRUE@am__append_34 = \
@@ -265,8 +267,7 @@ check_PROGRAMS = $(am__EXEEXT_5)
 # Necessary?
 #CLEANFILES += src/libmpg123/*.a
 @BUILD_LIBMPG123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_41 = src/libmpg123/libmpg123.la
-@BUILD_LIBMPG123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_42 = src/libmpg123/mpg123.h
+@BUILD_LIBMPG123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_42 = src/include/mpg123.h
-@NEED_FMT123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_43 = src/libmpg123/fmt123.h
 
 # All the optional sources leading to objects need to be explicitly
 # handled so that libtool builds the objects in a consistent manner,
@@ -358,105 +359,105 @@ check_PROGRAMS = $(am__EXEEXT_5)
 #NEON64+ACCURATE           synth_neon64_accurate.S synth_stereo_neon64_accurate.S
 #NEON64+!ACCURATE          dct64_neon64.S synth_neon64.S synth_stereo_neon64.S
 #EOT
-@HAVE_LAYER1_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_44 = src/libmpg123/layer1.c
+@HAVE_LAYER1_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_43 = src/libmpg123/layer1.c
-@HAVE_LAYER2_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_45 = src/libmpg123/layer2.c
+@HAVE_LAYER2_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_44 = src/libmpg123/layer2.c
-@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_46 = src/libmpg123/layer3.c
+@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_45 = src/libmpg123/layer3.c
-@HAVE_EQUALIZER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_47 = src/libmpg123/equalizer.c
+@HAVE_EQUALIZER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_46 = src/libmpg123/equalizer.c
-@HAVE_DITHER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_48 = src/libmpg123/dither.c
+@HAVE_DITHER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_47 = src/libmpg123/dither.c
-@HAVE_SYNTH8_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_49 = src/libmpg123/synth_8bit.c
+@HAVE_SYNTH8_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_48 = src/libmpg123/synth_8bit.c
-@HAVE_SYNTH16_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_50 = src/libmpg123/synth.c
+@HAVE_SYNTH16_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_49 = src/libmpg123/synth.c
-@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_51 = src/libmpg123/synth_s32.c
+@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_50 = src/libmpg123/synth_s32.c
-@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_52 = src/libmpg123/synth_real.c
+@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_51 = src/libmpg123/synth_real.c
-@HAVE_LFS_WRAP_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_53 = src/libmpg123/lfs_wrap.c
+@HAVE_LFS_WRAP_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_52 = src/libmpg123/lfs_wrap.c
-@HAVE_ICY_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_54 = src/libmpg123/icy.c src/libmpg123/icy2utf8.c
+@HAVE_ICY_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_53 = src/libmpg123/icy.c src/libmpg123/icy2utf8.c
-@HAVE_FEATURE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_55 = src/libmpg123/feature.c
+@HAVE_FEATURE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_54 = src/libmpg123/feature.c
-@HAVE_NTOM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_56 = src/libmpg123/ntom.c
+@HAVE_NTOM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_55 = src/libmpg123/ntom.c
-@HAVE_STRING_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_57 = src/libmpg123/stringbuf.c
+@HAVE_STRING_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_56 = src/libmpg123/stringbuf.c
-@HAVE_GETCPUFLAGS_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_58 = src/libmpg123/getcpuflags.S
+@HAVE_GETCPUFLAGS_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_57 = src/libmpg123/getcpuflags.S
-@HAVE_GETCPUFLAGS_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_59 = src/libmpg123/getcpuflags_x86_64.S
+@HAVE_GETCPUFLAGS_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_58 = src/libmpg123/getcpuflags_x86_64.S
-@HAVE_GETCPUFLAGS_ARM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_60 = src/libmpg123/getcpuflags_arm.c src/libmpg123/check_neon.S
+@HAVE_GETCPUFLAGS_ARM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_59 = src/libmpg123/getcpuflags_arm.c src/libmpg123/check_neon.S
-@HAVE_ALTIVEC_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_61 = src/libmpg123/synth_altivec.c src/libmpg123/dct64_altivec.c
+@HAVE_ALTIVEC_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_60 = src/libmpg123/synth_altivec.c src/libmpg123/dct64_altivec.c
-@HAVE_I386_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_62 = src/libmpg123/dct64_i386.c
+@HAVE_I386_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_61 = src/libmpg123/dct64_i386.c
-@HAVE_I486_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_63 = src/libmpg123/synth_i486.c src/libmpg123/dct64_i486.c
+@HAVE_I486_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_62 = src/libmpg123/synth_i486.c src/libmpg123/dct64_i486.c
-@HAVE_I586_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_64 = src/libmpg123/synth_i586.S
+@HAVE_I586_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_63 = src/libmpg123/synth_i586.S
-@HAVE_I586_DITHER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_65 = src/libmpg123/synth_i586_dither.S
+@HAVE_I586_DITHER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_64 = src/libmpg123/synth_i586_dither.S
-@HAVE_3DNOW_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_66 = src/libmpg123/synth_3dnow.S src/libmpg123/dct64_3dnow.S
+@HAVE_3DNOW_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_65 = src/libmpg123/synth_3dnow.S src/libmpg123/dct64_3dnow.S
-@HAVE_3DNOW_TRUE@@HAVE_EQUALIZER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_67 = src/libmpg123/equalizer_3dnow.S
+@HAVE_3DNOW_TRUE@@HAVE_EQUALIZER_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_66 = src/libmpg123/equalizer_3dnow.S
-@HAVE_3DNOW_VINTAGE_TRUE@@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_68 = src/libmpg123/dct36_3dnow.S
+@HAVE_3DNOW_VINTAGE_TRUE@@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_67 = src/libmpg123/dct36_3dnow.S
-@HAVE_3DNOWEXT_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_69 = src/libmpg123/dct64_3dnowext.S src/libmpg123/synth_3dnowext.S
+@HAVE_3DNOWEXT_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_68 = src/libmpg123/dct64_3dnowext.S src/libmpg123/synth_3dnowext.S
-@HAVE_3DNOWEXT_VINTAGE_TRUE@@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_70 = src/libmpg123/dct36_3dnowext.S
+@HAVE_3DNOWEXT_VINTAGE_TRUE@@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_69 = src/libmpg123/dct36_3dnowext.S
-@HAVE_MMXTAB_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_71 = src/libmpg123/tabinit_mmx.S
+@HAVE_MMXTAB_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_70 = src/libmpg123/tabinit_mmx.S
-@HAVE_MMX_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_72 = src/libmpg123/dct64_mmx.S src/libmpg123/synth_mmx.S
+@HAVE_MMX_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_71 = src/libmpg123/dct64_mmx.S src/libmpg123/synth_mmx.S
-@HAVE_FLOATDCT_TRUE@@HAVE_SSE_VINTAGE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_73 = src/libmpg123/dct64_sse_float.S
+@HAVE_FLOATDCT_TRUE@@HAVE_SSE_VINTAGE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_72 = src/libmpg123/dct64_sse_float.S
-@HAVE_SSE_VINTAGE_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_74 = src/libmpg123/synth_sse_float.S src/libmpg123/synth_stereo_sse_float.S
+@HAVE_SSE_VINTAGE_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_73 = src/libmpg123/synth_sse_float.S src/libmpg123/synth_stereo_sse_float.S
-@HAVE_SSE_VINTAGE_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_75 = src/libmpg123/synth_sse_s32.S src/libmpg123/synth_stereo_sse_s32.S
+@HAVE_SSE_VINTAGE_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_74 = src/libmpg123/synth_sse_s32.S src/libmpg123/synth_stereo_sse_s32.S
-@HAVE_LAYER3_TRUE@@HAVE_SSE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_76 = src/libmpg123/dct36_sse.S
+@HAVE_LAYER3_TRUE@@HAVE_SSE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_75 = src/libmpg123/dct36_sse.S
-@HAVE_ACCURATE_TRUE@@HAVE_SSE_VINTAGE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_77 = src/libmpg123/synth_sse_accurate.S src/libmpg123/synth_stereo_sse_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_SSE_VINTAGE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_76 = src/libmpg123/synth_sse_accurate.S src/libmpg123/synth_stereo_sse_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_SSE_VINTAGE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_78 = src/libmpg123/dct64_sse.S src/libmpg123/synth_sse.S
+@HAVE_ACCURATE_FALSE@@HAVE_SSE_VINTAGE_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_77 = src/libmpg123/dct64_sse.S src/libmpg123/synth_sse.S
-@HAVE_LAYER3_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_79 = src/libmpg123/dct36_x86_64.S
+@HAVE_LAYER3_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_78 = src/libmpg123/dct36_x86_64.S
-@HAVE_SYNTHREAL_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_80 = src/libmpg123/synth_stereo_x86_64_float.S
+@HAVE_SYNTHREAL_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_79 = src/libmpg123/synth_stereo_x86_64_float.S
-@HAVE_SYNTH32_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_81 = src/libmpg123/synth_stereo_x86_64_s32.S
+@HAVE_SYNTH32_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_80 = src/libmpg123/synth_stereo_x86_64_s32.S
-@HAVE_ACCURATE_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_82 = src/libmpg123/synth_stereo_x86_64_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_81 = src/libmpg123/synth_stereo_x86_64_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_83 = src/libmpg123/dct64_x86_64.S src/libmpg123/synth_stereo_x86_64.S
+@HAVE_ACCURATE_FALSE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_82 = src/libmpg123/dct64_x86_64.S src/libmpg123/synth_stereo_x86_64.S
-@HAVE_FLOATDCT_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_84 = src/libmpg123/dct64_x86_64_float.S
+@HAVE_FLOATDCT_TRUE@@HAVE_X86_64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_83 = src/libmpg123/dct64_x86_64_float.S
-@HAVE_SYNTHREAL_TRUE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_85 = src/libmpg123/synth_x86_64_float.S
+@HAVE_SYNTHREAL_TRUE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_84 = src/libmpg123/synth_x86_64_float.S
-@HAVE_SYNTH32_TRUE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_86 = src/libmpg123/synth_x86_64_s32.S
+@HAVE_SYNTH32_TRUE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_85 = src/libmpg123/synth_x86_64_s32.S
-@HAVE_ACCURATE_TRUE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_87 = src/libmpg123/synth_x86_64_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_86 = src/libmpg123/synth_x86_64_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_88 = src/libmpg123/synth_x86_64.S
+@HAVE_ACCURATE_FALSE@@HAVE_X86_64_MONO_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_87 = src/libmpg123/synth_x86_64.S
-@HAVE_AVX_TRUE@@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_89 = src/libmpg123/dct36_avx.S
+@HAVE_AVX_TRUE@@HAVE_LAYER3_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_88 = src/libmpg123/dct36_avx.S
-@HAVE_AVX_TRUE@@HAVE_FLOATDCT_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_90 = src/libmpg123/dct64_avx_float.S
+@HAVE_AVX_TRUE@@HAVE_FLOATDCT_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_89 = src/libmpg123/dct64_avx_float.S
-@HAVE_AVX_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_91 = src/libmpg123/synth_stereo_avx_float.S
+@HAVE_AVX_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_90 = src/libmpg123/synth_stereo_avx_float.S
-@HAVE_AVX_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_92 = src/libmpg123/synth_stereo_avx_s32.S
+@HAVE_AVX_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_91 = src/libmpg123/synth_stereo_avx_s32.S
-@HAVE_ACCURATE_TRUE@@HAVE_AVX_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_93 = src/libmpg123/synth_stereo_avx_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_AVX_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_92 = src/libmpg123/synth_stereo_avx_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_AVX_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_94 = src/libmpg123/dct64_avx.S src/libmpg123/synth_stereo_avx.S
+@HAVE_ACCURATE_FALSE@@HAVE_AVX_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_93 = src/libmpg123/dct64_avx.S src/libmpg123/synth_stereo_avx.S
-@HAVE_ACCURATE_TRUE@@HAVE_ARM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_95 = src/libmpg123/synth_arm_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_ARM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_94 = src/libmpg123/synth_arm_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_ARM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_96 = src/libmpg123/synth_arm.S
+@HAVE_ACCURATE_FALSE@@HAVE_ARM_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_95 = src/libmpg123/synth_arm.S
-@HAVE_LAYER3_TRUE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_97 = src/libmpg123/dct36_neon.S
+@HAVE_LAYER3_TRUE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_96 = src/libmpg123/dct36_neon.S
-@HAVE_FLOATDCT_TRUE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_98 = src/libmpg123/dct64_neon_float.S
+@HAVE_FLOATDCT_TRUE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_97 = src/libmpg123/dct64_neon_float.S
-@HAVE_NEON_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_99 = src/libmpg123/synth_neon_float.S src/libmpg123/synth_stereo_neon_float.S
+@HAVE_NEON_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_98 = src/libmpg123/synth_neon_float.S src/libmpg123/synth_stereo_neon_float.S
-@HAVE_NEON_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_100 = src/libmpg123/synth_neon_s32.S src/libmpg123/synth_stereo_neon_s32.S
+@HAVE_NEON_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_99 = src/libmpg123/synth_neon_s32.S src/libmpg123/synth_stereo_neon_s32.S
-@HAVE_ACCURATE_TRUE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_101 = src/libmpg123/synth_neon_accurate.S src/libmpg123/synth_stereo_neon_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_100 = src/libmpg123/synth_neon_accurate.S src/libmpg123/synth_stereo_neon_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_102 = src/libmpg123/dct64_neon.S src/libmpg123/synth_neon.S src/libmpg123/synth_stereo_neon.S
+@HAVE_ACCURATE_FALSE@@HAVE_NEON_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_101 = src/libmpg123/dct64_neon.S src/libmpg123/synth_neon.S src/libmpg123/synth_stereo_neon.S
-@HAVE_LAYER3_TRUE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_103 = src/libmpg123/dct36_neon64.S
+@HAVE_LAYER3_TRUE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_102 = src/libmpg123/dct36_neon64.S
-@HAVE_FLOATDCT_TRUE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_104 = src/libmpg123/dct64_neon64_float.S
+@HAVE_FLOATDCT_TRUE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_103 = src/libmpg123/dct64_neon64_float.S
-@HAVE_NEON64_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_105 = src/libmpg123/synth_neon64_float.S src/libmpg123/synth_stereo_neon64_float.S
+@HAVE_NEON64_TRUE@@HAVE_SYNTHREAL_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_104 = src/libmpg123/synth_neon64_float.S src/libmpg123/synth_stereo_neon64_float.S
-@HAVE_NEON64_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_106 = src/libmpg123/synth_neon64_s32.S src/libmpg123/synth_stereo_neon64_s32.S
+@HAVE_NEON64_TRUE@@HAVE_SYNTH32_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_105 = src/libmpg123/synth_neon64_s32.S src/libmpg123/synth_stereo_neon64_s32.S
-@HAVE_ACCURATE_TRUE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_107 = src/libmpg123/synth_neon64_accurate.S src/libmpg123/synth_stereo_neon64_accurate.S
+@HAVE_ACCURATE_TRUE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_106 = src/libmpg123/synth_neon64_accurate.S src/libmpg123/synth_stereo_neon64_accurate.S
-@HAVE_ACCURATE_FALSE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_108 = src/libmpg123/dct64_neon64.S src/libmpg123/synth_neon64.S src/libmpg123/synth_stereo_neon64.S
+@HAVE_ACCURATE_FALSE@@HAVE_NEON64_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_107 = src/libmpg123/dct64_neon64.S src/libmpg123/synth_neon64.S src/libmpg123/synth_stereo_neon64.S
-@BUILD_LIBSYN123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_109 = src/libsyn123/syn123.h
+@BUILD_LIBSYN123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_108 = src/include/syn123.h
-@BUILD_LIBSYN123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_110 = src/libsyn123/libsyn123.la
+@BUILD_LIBSYN123_TRUE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@am__append_109 = src/libsyn123/libsyn123.la
-@BUILD_PROGRAMS_TRUE@am__append_111 = src/out123
+@BUILD_PROGRAMS_TRUE@am__append_110 = src/out123
-@BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@am__append_112 = \
+@BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@am__append_111 = \
 @BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@  src/mpg123 \
 @BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@  src/mpg123-id3dump \
 @BUILD_PROGRAMS_TRUE@@HAVE_LFS_WRAP_TRUE@  src/mpg123-strip
 
-@TERM_POSIX_TRUE@am__append_113 = src/term_posix.c
+@TERM_POSIX_TRUE@am__append_112 = src/term_posix.c
-@TERM_WIN32_TRUE@am__append_114 = src/term_win32.c
+@TERM_WIN32_TRUE@am__append_113 = src/term_win32.c
-@TERM_NONE_TRUE@am__append_115 = src/term_none.c
+@TERM_NONE_TRUE@am__append_114 = src/term_none.c
-@NET123_TRUE@am__append_116 = src/net123.h
+@NET123_TRUE@am__append_115 = src/net123.h
-@NET123_EXEC_TRUE@am__append_117 = src/net123_exec.c
+@NET123_EXEC_TRUE@am__append_116 = src/net123_exec.c
-@NET123_WINHTTP_TRUE@am__append_118 = src/net123_winhttp.c
+@NET123_WINHTTP_TRUE@am__append_117 = src/net123_winhttp.c
-@NET123_WINHTTP_TRUE@am__append_119 = -lwinhttp
+@NET123_WINHTTP_TRUE@am__append_118 = -lwinhttp
-@NET123_WININET_TRUE@am__append_120 = src/net123_wininet.c
+@NET123_WININET_TRUE@am__append_119 = src/net123_wininet.c
-@NET123_WININET_TRUE@am__append_121 = -lwininet
+@NET123_WININET_TRUE@am__append_120 = -lwininet
-@WIN32_CODES_TRUE@am__append_122 = \
+@WIN32_CODES_TRUE@am__append_121 = \
+@WIN32_CODES_TRUE@  src/win32_support.c
+
+@NETWORK_WINSOCK_TRUE@@WIN32_CODES_TRUE@am__append_122 = src/win32_net.c
+@NETWORK_WINSOCK_TRUE@@WIN32_CODES_TRUE@am__append_123 = -lws2_32
+@WIN32_CODES_TRUE@am__append_124 = \
 @WIN32_CODES_TRUE@  src/win32_support.c
 
-@NETWORK_WINSOCK_TRUE@@WIN32_CODES_TRUE@am__append_123 = src/win32_net.c
-@NETWORK_WINSOCK_TRUE@@WIN32_CODES_TRUE@am__append_124 = -lws2_32
 @WIN32_CODES_TRUE@am__append_125 = \
 @WIN32_CODES_TRUE@  src/win32_support.c
 
-@WIN32_CODES_TRUE@am__append_126 = \
-@WIN32_CODES_TRUE@  src/win32_support.c
 
-
+# Pkg-config files and library includes.
-# Stuff from this directory.
+@BUILD_LIBMPG123_TRUE@@NEED_MAINLIB_TRUE@am__append_126 = libmpg123.pc
-@BUILD_LIBMPG123_TRUE@@NEED_MAINLIB_TRUE@am__append_127 = libmpg123.pc
+@BUILD_LIBOUT123_TRUE@@NEED_MAINLIB_TRUE@am__append_127 = libout123.pc
-@BUILD_LIBOUT123_TRUE@@NEED_MAINLIB_TRUE@am__append_128 = libout123.pc
+@BUILD_LIBSYN123_TRUE@@NEED_MAINLIB_TRUE@am__append_128 = libsyn123.pc
-@BUILD_LIBSYN123_TRUE@@NEED_MAINLIB_TRUE@am__append_129 = libsyn123.pc
+@BUILD_PROGRAMS_TRUE@am__append_129 = man1/mpg123.1 man1/out123.1
-@BUILD_PROGRAMS_TRUE@am__append_130 = man1/mpg123.1 man1/out123.1
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -548,35 +549,33 @@ src_compat_libcompat_str_la_LIBADD =
 am_src_compat_libcompat_str_la_OBJECTS = src/compat/compat_str.lo
 src_compat_libcompat_str_la_OBJECTS =  \
 	$(am_src_compat_libcompat_str_la_OBJECTS)
-am__src_libmpg123_libmpg123_la_SOURCES_DIST = src/libmpg123/fmt123.h \
+am__src_libmpg123_libmpg123_la_SOURCES_DIST =  \
 	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/format.c src/libmpg123/frame.h \
-	src/libmpg123/frame.h src/libmpg123/reader.h \
+	src/libmpg123/reader.h src/libmpg123/decode.h \
-	src/libmpg123/debug.h src/libmpg123/decode.h \
+	src/libmpg123/dct64.c src/libmpg123/synth.h \
-	src/libmpg123/sample.h src/libmpg123/dct64.c \
+	src/libmpg123/synth_mono.h src/libmpg123/synth_ntom.h \
-	src/libmpg123/synth.h src/libmpg123/synth_mono.h \
+	src/libmpg123/synth_8bit.h src/libmpg123/synths.h \
-	src/libmpg123/synth_ntom.h src/libmpg123/synth_8bit.h \
+	src/libmpg123/huffman.h src/libmpg123/newhuffman.h \
-	src/libmpg123/synths.h src/libmpg123/huffman.h \
+	src/libmpg123/icy.h src/libmpg123/icy2utf8.h \
-	src/libmpg123/newhuffman.h src/libmpg123/icy.h \
+	src/libmpg123/id3.h src/libmpg123/id3.c \
-	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 src/libmpg123/readers.c \
 	src/libmpg123/lfs_wrap.h src/libmpg123/costabs.h \
 	src/libmpg123/tabinit.c src/libmpg123/libmpg123.c \
 	src/libmpg123/gapless.h src/libmpg123/mpg123lib_intern.h \
-	src/libmpg123/abi_align.h src/libmpg123/mangle.h \
+	src/libmpg123/mangle.h src/libmpg123/getcpuflags.h \
-	src/libmpg123/getcpuflags.h src/libmpg123/index.h \
+	src/libmpg123/index.h src/libmpg123/index.c \
-	src/libmpg123/index.c src/libmpg123/layer1.c \
+	src/libmpg123/layer1.c src/libmpg123/layer2.c \
-	src/libmpg123/layer2.c src/libmpg123/layer3.c \
+	src/libmpg123/layer3.c src/libmpg123/equalizer.c \
-	src/libmpg123/equalizer.c src/libmpg123/dither.c \
+	src/libmpg123/dither.c src/libmpg123/synth_8bit.c \
-	src/libmpg123/synth_8bit.c src/libmpg123/synth.c \
+	src/libmpg123/synth.c src/libmpg123/synth_s32.c \
-	src/libmpg123/synth_s32.c src/libmpg123/synth_real.c \
+	src/libmpg123/synth_real.c src/libmpg123/lfs_wrap.c \
-	src/libmpg123/lfs_wrap.c src/libmpg123/icy.c \
+	src/libmpg123/icy.c src/libmpg123/icy2utf8.c \
-	src/libmpg123/icy2utf8.c src/libmpg123/feature.c \
+	src/libmpg123/feature.c src/libmpg123/ntom.c \
-	src/libmpg123/ntom.c src/libmpg123/stringbuf.c \
+	src/libmpg123/stringbuf.c src/libmpg123/getcpuflags.S \
-	src/libmpg123/getcpuflags.S src/libmpg123/getcpuflags_x86_64.S \
+	src/libmpg123/getcpuflags_x86_64.S \
 	src/libmpg123/getcpuflags_arm.c src/libmpg123/check_neon.S \
 	src/libmpg123/synth_altivec.c src/libmpg123/dct64_altivec.c \
 	src/libmpg123/dct64_i386.c src/libmpg123/synth_i486.c \
@@ -820,7 +819,7 @@ src_libout123_libmodule_la_OBJECTS =  \
 @NEED_LIB_TRUE@	src/libout123/libmodule.la \
 @NEED_LIB_TRUE@	src/compat/libcompat.la $(am__append_35) \
 @NEED_LIB_TRUE@	$(am__append_36)
-am__src_libout123_libout123_la_SOURCES_DIST = src/libout123/out123.h \
+am__src_libout123_libout123_la_SOURCES_DIST =  \
 	src/libout123/libout123.c src/libout123/stringlists.h \
 	src/libout123/stringlists.c src/libout123/out123_int.h \
 	src/libout123/wav.c src/libout123/wav.h src/libout123/hextxt.c \
@@ -955,10 +954,10 @@ src_libout123_modules_output_coreaudio_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(LDFLAGS) -o $@
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am_src_libout123_modules_output_coreaudio_la_rpath = -rpath \
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_COREAUDIO_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	$(pkglibdir)
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_DEPENDENCIES = src/compat/libcompat_str.la
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_DEPENDENCIES = src/compat/libcompat_str.la
 am__src_libout123_modules_output_dummy_la_SOURCES_DIST =  \
 	src/libout123/modules/dummy.c
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am_src_libout123_modules_output_dummy_la_OBJECTS = src/libout123/modules/output_dummy_la-dummy.lo
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am_src_libout123_modules_output_dummy_la_OBJECTS = src/libout123/modules/output_dummy_la-dummy.lo
 src_libout123_modules_output_dummy_la_OBJECTS =  \
 	$(am_src_libout123_modules_output_dummy_la_OBJECTS)
 src_libout123_modules_output_dummy_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -966,8 +965,9 @@ src_libout123_modules_output_dummy_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(CCLD) $(src_libout123_modules_output_dummy_la_CFLAGS) \
 	$(CFLAGS) $(src_libout123_modules_output_dummy_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am_src_libout123_modules_output_dummy_la_rpath = -rpath \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@am_src_libout123_modules_output_dummy_la_rpath =  \
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	$(pkglibdir)
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	-rpath \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	$(pkglibdir)
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_ESD_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_esd_la_DEPENDENCIES = src/compat/libcompat_str.la
 am__src_libout123_modules_output_esd_la_SOURCES_DIST =  \
 	src/libout123/modules/esd.c
@@ -1205,7 +1205,7 @@ src_libout123_modules_output_win32_wasapi_la_LINK = $(LIBTOOL) \
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_WIN32_WASAPI_TRUE@@NEED_LIB_TRUE@	$(pkglibdir)
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@src_libsyn123_libsyn123_la_DEPENDENCIES =  \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/compat/libcompat_str.la
-am__src_libsyn123_libsyn123_la_SOURCES_DIST = src/libsyn123/syn123.h \
+am__src_libsyn123_libsyn123_la_SOURCES_DIST =  \
 	src/libsyn123/syn123_int.h src/libsyn123/g711_impl.h \
 	src/libsyn123/pinknoise.c src/libsyn123/geiger.c \
 	src/libsyn123/libsyn123.c src/libsyn123/volume.c \
@@ -1269,9 +1269,8 @@ am_src_mpg123_OBJECTS = src/audio.$(OBJEXT) src/common.$(OBJEXT) \
 	$(am__objects_77)
 src_mpg123_OBJECTS = $(am_src_mpg123_OBJECTS)
 am__DEPENDENCIES_1 =
-src_mpg123_DEPENDENCIES = src/compat/libcompat.la \
+src_mpg123_DEPENDENCIES = src/compat/libcompat.la $(LIBMPG123) \
-	src/libmpg123/libmpg123.la src/libout123/libout123.la \
+	$(LIBOUT123) $(LIBSYN123) $(am__DEPENDENCIES_1) \
-	src/libsyn123/libsyn123.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 src_mpg123_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -1281,13 +1280,11 @@ am__src_mpg123_id3dump_SOURCES_DIST = src/mpg123-id3dump.c \
 am_src_mpg123_id3dump_OBJECTS = src/mpg123-id3dump.$(OBJEXT) \
 	src/getlopt.$(OBJEXT) $(am__objects_76)
 src_mpg123_id3dump_OBJECTS = $(am_src_mpg123_id3dump_OBJECTS)
-src_mpg123_id3dump_DEPENDENCIES = src/compat/libcompat.la \
+src_mpg123_id3dump_DEPENDENCIES = src/compat/libcompat.la $(LIBMPG123)
-	src/libmpg123/libmpg123.la
 am_src_mpg123_strip_OBJECTS = src/mpg123-strip.$(OBJEXT) \
 	src/getlopt.$(OBJEXT)
 src_mpg123_strip_OBJECTS = $(am_src_mpg123_strip_OBJECTS)
-src_mpg123_strip_DEPENDENCIES = src/compat/libcompat.la \
+src_mpg123_strip_DEPENDENCIES = src/compat/libcompat.la $(LIBMPG123)
-	src/libmpg123/libmpg123.la
 am__src_out123_SOURCES_DIST = src/sysutil.c src/sysutil.h src/common.h \
 	src/getlopt.c src/getlopt.h src/local.h src/local.c \
 	src/filters.h src/filters.c src/out123.c src/mpg123app.h \
@@ -1296,53 +1293,52 @@ am_src_out123_OBJECTS = src/sysutil.$(OBJEXT) src/getlopt.$(OBJEXT) \
 	src/local.$(OBJEXT) src/filters.$(OBJEXT) src/out123.$(OBJEXT) \
 	$(am__objects_76)
 src_out123_OBJECTS = $(am_src_out123_OBJECTS)
-src_out123_DEPENDENCIES = src/compat/libcompat.la \
+src_out123_DEPENDENCIES = src/compat/libcompat.la $(LIBSYN123) \
-	src/libsyn123/libsyn123.la src/libout123/libout123.la
+	$(LIBOUT123)
 src_out123_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_out123_LDFLAGS) $(LDFLAGS) -o $@
 am_src_tests_decode_fixed_OBJECTS = src/tests/decode_fixed.$(OBJEXT)
 src_tests_decode_fixed_OBJECTS = $(am_src_tests_decode_fixed_OBJECTS)
 src_tests_decode_fixed_DEPENDENCIES = src/compat/libcompat.la \
-	src/libmpg123/libmpg123.la
+	$(LIBMPG123)
 am_src_tests_noise_OBJECTS = src/tests/noise.$(OBJEXT)
 src_tests_noise_OBJECTS = $(am_src_tests_noise_OBJECTS)
 src_tests_noise_DEPENDENCIES = src/compat/libcompat.la
 am_src_tests_plain_id3_OBJECTS = src/tests/plain_id3.$(OBJEXT)
 src_tests_plain_id3_OBJECTS = $(am_src_tests_plain_id3_OBJECTS)
 src_tests_plain_id3_DEPENDENCIES = src/compat/libcompat.la \
-	src/libmpg123/libmpg123.la
+	$(LIBMPG123)
 am_src_tests_resample_total_OBJECTS =  \
 	src/tests/resample_total.$(OBJEXT)
 src_tests_resample_total_OBJECTS =  \
 	$(am_src_tests_resample_total_OBJECTS)
-src_tests_resample_total_DEPENDENCIES = src/libsyn123/libsyn123.la
+src_tests_resample_total_DEPENDENCIES = $(LIBSYN123)
 am_src_tests_seek_accuracy_OBJECTS =  \
 	src/tests/seek_accuracy.$(OBJEXT)
 src_tests_seek_accuracy_OBJECTS =  \
 	$(am_src_tests_seek_accuracy_OBJECTS)
 src_tests_seek_accuracy_DEPENDENCIES = src/compat/libcompat.la \
-	src/libmpg123/libmpg123.la
+	$(LIBMPG123)
 am_src_tests_seek_whence_OBJECTS = src/tests/seek_whence.$(OBJEXT)
 src_tests_seek_whence_OBJECTS = $(am_src_tests_seek_whence_OBJECTS)
 src_tests_seek_whence_DEPENDENCIES = src/compat/libcompat.la \
-	src/libmpg123/libmpg123.la
+	$(LIBMPG123)
 am_src_tests_sweeper_OBJECTS = src/tests/sweeper.$(OBJEXT)
 src_tests_sweeper_OBJECTS = $(am_src_tests_sweeper_OBJECTS)
-src_tests_sweeper_DEPENDENCIES = src/compat/libcompat.la \
+src_tests_sweeper_DEPENDENCIES = src/compat/libcompat.la $(LIBSYN123) \
-	src/libsyn123/libsyn123.la src/libout123/libout123.la
+	$(LIBOUT123)
 am_src_tests_text_OBJECTS = src/tests/text.$(OBJEXT)
 src_tests_text_OBJECTS = $(am_src_tests_text_OBJECTS)
-src_tests_text_DEPENDENCIES = src/compat/libcompat.la \
+src_tests_text_DEPENDENCIES = src/compat/libcompat.la $(LIBMPG123)
-	src/libmpg123/libmpg123.la
 am_src_tests_textprint_OBJECTS = src/tests/textprint.$(OBJEXT) \
 	src/local.$(OBJEXT) src/genre.$(OBJEXT)
 src_tests_textprint_OBJECTS = $(am_src_tests_textprint_OBJECTS)
 src_tests_textprint_DEPENDENCIES = src/compat/libcompat.la \
-	src/libmpg123/libmpg123.la
+	$(LIBMPG123)
 am_src_tests_volume_OBJECTS = src/tests/volume.$(OBJEXT)
 src_tests_volume_OBJECTS = $(am_src_tests_volume_OBJECTS)
-src_tests_volume_DEPENDENCIES = src/libsyn123/libsyn123.la
+src_tests_volume_DEPENDENCIES = $(LIBSYN123)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -1671,9 +1667,8 @@ man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man_MANS)
 DATA = $(pkgconfig_DATA)
-am__include_HEADERS_DIST = src/libout123/out123.h \
+am__include_HEADERS_DIST = src/include/out123.h src/include/mpg123.h \
-	src/libmpg123/mpg123.h src/libmpg123/fmt123.h \
+	src/include/syn123.h src/include/fmt123.h
-	src/libsyn123/syn123.h
 HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
@@ -1880,6 +1875,7 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
 	$(srcdir)/doc/Makemodule.am $(srcdir)/libmpg123.pc.in \
 	$(srcdir)/libout123.pc.in $(srcdir)/libsyn123.pc.in \
 	$(srcdir)/mpg123.spec.in $(srcdir)/src/Makemodule.am \
+	$(srcdir)/src/common/Makemodule.am \
 	$(srcdir)/src/compat/Makemodule.am \
 	$(srcdir)/src/libmpg123/Makemodule.am \
 	$(srcdir)/src/libout123/Makemodule.am \
@@ -2134,11 +2130,15 @@ ACLOCAL_AMFLAGS = -I m4
 
 # Why do I have to repeat the test scripts here?
 
+# common headers shared between subprojects
+
 # mpg123.spec is autogenerated but needs to be present in tarball!
 EXTRA_DIST = src/tests/testtext.sh src/tests/decode_fixed.sh \
 	src/tests/seek_whence.sh src/tests/seek_accuracy.sh \
 	src/tests/plain_id3.sh src/tests/plain_id3.txt \
-	src/tests/sweep.mp3 $(am__append_39) src/version.h \
+	src/tests/sweep.mp3 src/common/abi_align.h src/common/debug.h \
+	src/common/sample.h src/common/swap_bytes_impl.h \
+	src/common/true.h $(am__append_39) src/version.h \
 	src/mpg123-with-modules src/out123-with-modules \
 	doc/BENCHMARKING doc/BUGS doc/CONTACT doc/PATENTS \
 	doc/README.3DNOW doc/README.gain doc/README.remote \
@@ -2151,7 +2151,7 @@ EXTRA_DIST = src/tests/testtext.sh src/tests/decode_fixed.sh \
 	doc/examples/mpg123_to_wav_reader64.c doc/examples/scan.c \
 	doc/examples/mpglib.c doc/examples/id3dump.c \
 	doc/examples/feedseek.c doc/examples/dump_seekindex.c \
-	doc/examples/extract_frames.c doc/examples/Makefile \
+	doc/examples/extract_frames.c doc/examples/Makefile test_c99.c \
 	mpg123.spec makedll.sh windows-builds.sh equalize.dat \
 	NEWS.libmpg123 NEWS.libout123 NEWS.libsyn123 \
 	ports/cmake/CMakeLists.txt \
@@ -2184,56 +2184,61 @@ EXTRA_DIST = src/tests/testtext.sh src/tests/decode_fixed.sh \
 @NEED_LIB_TRUE@	$(am__append_26) $(am__append_27) \
 @NEED_LIB_TRUE@	$(am__append_28) $(am__append_29)
 @NEED_LIB_TRUE@lib_LTLIBRARIES = $(am__append_33) $(am__append_41) \
-@NEED_LIB_TRUE@	$(am__append_110)
+@NEED_LIB_TRUE@	$(am__append_109)
 noinst_LIBRARIES = 
 noinst_LTLIBRARIES = src/compat/libcompat.la \
 	src/compat/libcompat_str.la src/compat/libcompat_dl.la \
 	$(am__append_30) $(am__append_32)
 nodist_include_HEADERS = 
+
+# All main libraries need fmt123 header installed.
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@include_HEADERS = $(am__append_31) \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_42) \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_43) \
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_108) \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_109)
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/include/fmt123.h
 # Attempts to wrap that in NEED_MAN failed. So just live with the
 # empty directory.
-dist_man_MANS = $(am__append_130)
+dist_man_MANS = $(am__append_129)
 CLEANFILES = src/*.a
 XFAIL_TESTS = $(am__append_3)
-# That can be trimmed down later when adapting the sources to
+
-# use relative paths for includes.
+# Include Make modules from subdirectories.
-# Watch out for generated headers (that's why top_builddir is also present).
+
+# Always use our set of API headers.
 AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\"" $(LTDLINCL) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/src/compat \
+	-I$(top_srcdir)/src/include
-	-I$(top_srcdir)/src/libmpg123 -I$(top_srcdir)/src/libsyn123 \
+
-	-I$(top_srcdir)/src/libout123 -I$(top_builddir)/src/libmpg123 \
+# Central place defining the mpg123 libraries to be used. You could
-	-I$(top_builddir)/src/libsyn123 \
+# put -lmpg123 in here to use an external one (for whatever reason).
-	-I$(top_builddir)/src/libout123
+LIBMPG123 = src/libmpg123/libmpg123.la
+LIBOUT123 = src/libout123/libout123.la
+LIBSYN123 = src/libsyn123/libsyn123.la
 src_tests_volume_SOURCES = \
   src/tests/volume.c
 
 src_tests_volume_LDADD = \
-  src/libsyn123/libsyn123.la
+  $(LIBSYN123)
 
 src_tests_decode_fixed_SOURCES = \
   src/tests/decode_fixed.c
 
 src_tests_decode_fixed_LDADD = \
   src/compat/libcompat.la \
-  src/libmpg123/libmpg123.la
+  $(LIBMPG123)
 
 src_tests_seek_whence_SOURCES = \
   src/tests/seek_whence.c
 
 src_tests_seek_whence_LDADD = \
   src/compat/libcompat.la \
-  src/libmpg123/libmpg123.la
+  $(LIBMPG123)
 
 src_tests_seek_accuracy_SOURCES = \
   src/tests/seek_accuracy.c
 
 src_tests_seek_accuracy_LDADD = \
   src/compat/libcompat.la \
-  src/libmpg123/libmpg123.la
+  $(LIBMPG123)
 
 src_tests_noise_SOURCES = \
   src/tests/noise.c \
@@ -2248,14 +2253,14 @@ src_tests_sweeper_SOURCES = \
 
 src_tests_sweeper_LDADD = \
   src/compat/libcompat.la \
-  src/libsyn123/libsyn123.la \
+  $(LIBSYN123) \
-  src/libout123/libout123.la
+  $(LIBOUT123)
 
 src_tests_resample_total_SOURCES = \
   src/tests/resample_total.c
 
 src_tests_resample_total_LDADD = \
-  src/libsyn123/libsyn123.la
+  $(LIBSYN123)
 
 src_tests_text_SOURCES = \
   src/tests/text.c \
@@ -2263,7 +2268,7 @@ src_tests_text_SOURCES = \
 
 src_tests_text_LDADD = \
   src/compat/libcompat.la \
-  src/libmpg123/libmpg123.la
+  $(LIBMPG123)
 
 src_tests_textprint_SOURCES = \
   src/tests/textprint.c \
@@ -2272,14 +2277,14 @@ src_tests_textprint_SOURCES = \
 
 src_tests_textprint_LDADD = \
   src/compat/libcompat.la \
-  src/libmpg123/libmpg123.la
+  $(LIBMPG123)
 
 src_tests_plain_id3_SOURCES = \
   src/tests/plain_id3.c
 
 src_tests_plain_id3_LDADD = \
   src/compat/libcompat.la \
-  src/libmpg123/libmpg123.la
+  $(LIBMPG123)
 
 src_compat_libcompat_la_SOURCES = \
   src/compat/compat_str.c \
@@ -2303,20 +2308,11 @@ src_compat_libcompat_dl_la_SOURCES = \
 
 src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 
-# Do not include uneeded headers from mpg123app.h .
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@libout123_mod_cppflags = -DBUILDING_OUTPUT_MODULES=1
-
 # Do not include uneeded headers from mpg123app.h .
 @BUILD_LIBOUT123_TRUE@@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@libout123_mod_cppflags = -DBUILDING_OUTPUT_MODULES=1
 
-# These are not tested and _very_ likely need work: aix alib hp os2 sgi mint
+# Do not include uneeded headers from mpg123app.h .
-
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@libout123_mod_cppflags = -DBUILDING_OUTPUT_MODULES=1
-# Linker flags that all dynamic modules share.
-# The -shared avoids useless static archives of output modules in a build
-# that also produces normal static libs.
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@MODULE_LDFLAGS = -module -no-undefined -avoid-version \
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  -export-dynamic  -export-symbols-regex '^mpg123_'
-
 
 # These are not tested and _very_ likely need work: aix alib hp os2 sgi mint
 
@@ -2326,20 +2322,29 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @BUILD_LIBOUT123_TRUE@@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@MODULE_LDFLAGS = -module -no-undefined -avoid-version \
 @BUILD_LIBOUT123_TRUE@@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  -export-dynamic  -export-symbols-regex '^mpg123_'
 
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@MODULE_CFLAGS = -shared
+
+# These are not tested and _very_ likely need work: aix alib hp os2 sgi mint
+
+# Linker flags that all dynamic modules share.
+# The -shared avoids useless static archives of output modules in a build
+# that also produces normal static libs.
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@MODULE_LDFLAGS = -module -no-undefined -avoid-version \
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  -export-dynamic  -export-symbols-regex '^mpg123_'
+
 @BUILD_LIBOUT123_TRUE@@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@MODULE_CFLAGS = -shared
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_SOURCES = \
+@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@MODULE_CFLAGS = -shared
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  src/libout123/modules/dummy.c
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_SOURCES = \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  src/libout123/modules/dummy.c
 
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_LDFLAGS = $(MODULE_LDFLAGS) @DUMMY_LDFLAGS@
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_LDFLAGS = $(MODULE_LDFLAGS) @DUMMY_LDFLAGS@
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_CFLAGS = $(MODULE_CFLAGS) @DUMMY_CFLAGS@
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_CFLAGS = $(MODULE_CFLAGS) @DUMMY_CFLAGS@
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_LIBADD = @PROG_LIBS@ \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_dummy_la_LIBADD = @PROG_LIBS@ \
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  src/compat/libcompat_str.la \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  src/compat/libcompat_str.la \
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  @DUMMY_LIBS@
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  @DUMMY_LIBS@
 
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_outout_dummy_la_CPPFLAGS = \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@src_libout123_modules_outout_dummy_la_CPPFLAGS = \
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  $(AM_CPPFLAGS) \
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  $(AM_CPPFLAGS) \
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  $(libout123_mod_cppflags)
+@HAVE_DUMMY_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@  $(libout123_mod_cppflags)
 
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@@NEED_LIB_TRUE@src_libout123_modules_output_tinyalsa_la_SOURCES = \
 @BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@HAVE_TINYALSA_TRUE@@NEED_LIB_TRUE@  src/libout123/modules/tinyalsa.c
@@ -2881,7 +2886,6 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @BUILD_LIBOUT123_TRUE@@BUILD_WIN32_WASAPI_TRUE@@HAVE_MODULES_FALSE@@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  $(libout123_mod_cppflags)
 
 @NEED_LIB_TRUE@src_libout123_libout123_la_SOURCES =  \
-@NEED_LIB_TRUE@	src/libout123/out123.h \
 @NEED_LIB_TRUE@	src/libout123/libout123.c \
 @NEED_LIB_TRUE@	src/libout123/stringlists.h \
 @NEED_LIB_TRUE@	src/libout123/stringlists.c \
@@ -2926,18 +2930,14 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/compat/libcompat.la
 
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@src_libmpg123_libmpg123_la_SOURCES =  \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/fmt123.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/mpeghead.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/parse.c \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/parse.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/frame.c \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/format.c \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/swap_bytes_impl.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/frame.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/reader.h \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/debug.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/decode.h \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/sample.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/dct64.c \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/synth.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/synth_mono.h \
@@ -2950,7 +2950,6 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/icy2utf8.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/id3.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/id3.c \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/true.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/getbits.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/optimize.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/optimize.c \
@@ -2961,11 +2960,11 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/libmpg123.c \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/gapless.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/mpg123lib_intern.h \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/abi_align.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/mangle.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/getcpuflags.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/index.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	src/libmpg123/index.c \
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_43) \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_44) \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_45) \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_46) \
@@ -3029,8 +3028,7 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_104) \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_105) \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_106) \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_107) \
+@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_107)
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@	$(am__append_108)
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@EXTRA_src_libmpg123_libmpg123_la_SOURCES = \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libmpg123/l2tables.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libmpg123/l12tabs.h \
@@ -3067,7 +3065,6 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  @LIBSYN123_LIBS@
 
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@src_libsyn123_libsyn123_la_SOURCES = \
-@NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libsyn123/syn123.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libsyn123/syn123_int.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libsyn123/g711_impl.h \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libsyn123/pinknoise.c \
@@ -3078,26 +3075,25 @@ src_compat_libcompat_dl_la_LIBADD = @LIBDL@
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libsyn123/filter.c \
 @NEED_LIB_TRUE@@NEED_MAINLIB_TRUE@  src/libsyn123/sampleconv.c
 
-src_mpg123_LDADD = src/compat/libcompat.la src/libmpg123/libmpg123.la \
+src_mpg123_LDADD = src/compat/libcompat.la $(LIBMPG123) $(LIBOUT123) \
-	src/libout123/libout123.la src/libsyn123/libsyn123.la \
+	$(LIBSYN123) @PROG_LIBS@ $(am__append_118) $(am__append_120) \
-	@PROG_LIBS@ $(am__append_119) $(am__append_121) \
+	$(am__append_123)
-	$(am__append_124)
 src_mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@
 src_out123_LDADD = \
   src/compat/libcompat.la \
-  src/libsyn123/libsyn123.la \
+  $(LIBSYN123) \
-  src/libout123/libout123.la \
+  $(LIBOUT123) \
   @PROG_LIBS@
 
 src_out123_LDFLAGS = @EXEC_LT_LDFLAGS@
 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@
 
 
@@ -3109,35 +3105,33 @@ src_mpg123_SOURCES = src/audio.c src/audio.h src/common.c src/common.h \
 	src/genre.c src/mpg123.c src/mpg123app.h src/metaprint.c \
 	src/metaprint.h src/local.h src/local.c src/playlist.c \
 	src/playlist.h src/streamdump.h src/streamdump.c src/term.c \
-	src/term.h src/terms.h src/win32_support.h $(am__append_113) \
+	src/term.h src/terms.h src/win32_support.h $(am__append_112) \
-	$(am__append_114) $(am__append_115) $(am__append_116) \
+	$(am__append_113) $(am__append_114) $(am__append_115) \
-	$(am__append_117) $(am__append_118) $(am__append_120) \
+	$(am__append_116) $(am__append_117) $(am__append_119) \
-	$(am__append_122) $(am__append_123)
+	$(am__append_121) $(am__append_122)
 
 # Replace common.h by sysutil.h!
 src_out123_SOURCES = src/sysutil.c src/sysutil.h src/common.h \
 	src/getlopt.c src/getlopt.h src/local.h src/local.c \
 	src/filters.h src/filters.c src/out123.c src/mpg123app.h \
-	src/win32_support.h $(am__append_125)
+	src/win32_support.h $(am__append_124)
 src_mpg123_id3dump_SOURCES = src/mpg123-id3dump.c src/getlopt.c \
-	src/getlopt.h $(am__append_126)
+	src/getlopt.h $(am__append_125)
 src_mpg123_strip_SOURCES = \
   src/mpg123-strip.c \
   src/getlopt.c \
   src/getlopt.h
 
-
-# Include Make modules from subdirectories.
 @NEED_MAINLIB_TRUE@pkgconfigdir = $(libdir)/pkgconfig
-@NEED_MAINLIB_TRUE@pkgconfig_DATA = $(am__append_127) \
+@NEED_MAINLIB_TRUE@pkgconfig_DATA = $(am__append_126) \
-@NEED_MAINLIB_TRUE@	$(am__append_128) $(am__append_129)
+@NEED_MAINLIB_TRUE@	$(am__append_127) $(am__append_128)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/src/Makemodule.am $(srcdir)/src/tests/Makemodule.am $(srcdir)/src/compat/Makemodule.am $(srcdir)/src/libout123/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libmpg123/Makemodule.am $(srcdir)/src/libsyn123/Makemodule.am $(srcdir)/doc/Makemodule.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/src/Makemodule.am $(srcdir)/src/tests/Makemodule.am $(srcdir)/src/compat/Makemodule.am $(srcdir)/src/common/Makemodule.am $(srcdir)/src/libout123/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libmpg123/Makemodule.am $(srcdir)/src/libsyn123/Makemodule.am $(srcdir)/doc/Makemodule.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -3159,7 +3153,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(srcdir)/src/Makemodule.am $(srcdir)/src/tests/Makemodule.am $(srcdir)/src/compat/Makemodule.am $(srcdir)/src/libout123/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libmpg123/Makemodule.am $(srcdir)/src/libsyn123/Makemodule.am $(srcdir)/doc/Makemodule.am $(am__empty):
+$(srcdir)/src/Makemodule.am $(srcdir)/src/tests/Makemodule.am $(srcdir)/src/compat/Makemodule.am $(srcdir)/src/common/Makemodule.am $(srcdir)/src/libout123/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libout123/modules/Makemodule.am $(srcdir)/src/libmpg123/Makemodule.am $(srcdir)/src/libsyn123/Makemodule.am $(srcdir)/doc/Makemodule.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -5559,10 +5553,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@BUILD_LIBOUT123_MODULES_FALSE@install-exec-hook:
+@BUILD_LIBOUT123_OR_MODULES_FALSE@install-exec-hook:
 @HAVE_MODULES_FALSE@install-exec-hook:
 @NEED_LIB_FALSE@install-exec-hook:
-@BUILD_LIBOUT123_MODULES_FALSE@uninstall-hook:
+@BUILD_LIBOUT123_OR_MODULES_FALSE@uninstall-hook:
 @HAVE_MODULES_FALSE@uninstall-hook:
 @NEED_LIB_FALSE@uninstall-hook:
 clean: clean-am
@@ -6093,11 +6087,11 @@ clean-local-check:
 	rm -f src/tests/sweepsweep.mp3 src/tests/stripsweep.mp3 src/tests/plain_id3.out.txt
 
 # Get rid of .la files, at least _after_ install.
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@install-exec-hook:
+@BUILD_LIBOUT123_OR_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@install-exec-hook:
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	cd $(DESTDIR)$(pkglibdir) && rm -f @output_modules_la@
+@BUILD_LIBOUT123_OR_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	cd $(DESTDIR)$(pkglibdir) && rm -f @output_modules_la@
 # The above breaks uninstall of module .so files?
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@uninstall-hook:
+@BUILD_LIBOUT123_OR_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@uninstall-hook:
-@BUILD_LIBOUT123_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	for m in @output_modules_la@; do eval $$(grep dlname= src/libout123/modules/$$m) && rm -f $(DESTDIR)$(pkglibdir)/$$dlname; done
+@BUILD_LIBOUT123_OR_MODULES_TRUE@@HAVE_MODULES_TRUE@@NEED_LIB_TRUE@	for m in @output_modules_la@; do eval $$(grep dlname= src/libout123/modules/$$m) && rm -f $(DESTDIR)$(pkglibdir)/$$dlname; done
 
 # Get rid of .la files, at least _after_ install.
 #install-exec-hook:

NEWS

@@ -1,3 +1,21 @@
+1.32.4
+------
+- build:
+-- Reorganize shared headers, API headers into src/include.
+-- Use relative include paths, avoiding internal directories in
+   CPPFLAGS except for config.h.
+-- Group C99 feature checks and make several standard headers
+   mandatory.
+-- Get rid of SIZE_P, OFF_P and friends.
+-- Only enforce dummy module together with libout123, to be able
+   to build individual modules using --disable-components logic.
+- out123:
+-- added --libversion
+- libmpg123:
+-- Avoid indirect branches into the assembly routines by using C wrappers
+   also for dct36, relieving us of the need to care for bti / endbr
+   instructions for control flow integrity.
+
 1.32.3
 ------
 - ports/cmake: Only enable modules with GetThreadErrorMode() on Windows.
@@ -8,7 +26,6 @@
 
 1.32.2
 ------
-
 - libmpg123: Re-introduce _64 symbols on native 64 bit offset platforms. This
   was a regression since 1.31 series. Sorry, too much cleanup, not enough
   testing.

configure.ac

@@ -32,7 +32,7 @@ m4_undefine([V_HEADER])
 
 AC_INIT([mpg123], V_MAJOR.V_MINOR.V_PATCH[]V_SUFFIX, [maintainer@mpg123.org])
 
-m4_define([V_HEADER], m4_esyscmd(grep -e _API_VERSION -e _PATCHLEVEL src/libmpg123/mpg123.h src/libout123/out123.h src/libsyn123/syn123.h))
+m4_define([V_HEADER], m4_esyscmd(grep -e _API_VERSION -e _PATCHLEVEL src/include/mpg123.h src/include/out123.h src/include/syn123.h))
 
 dnl libmpg123
 m4_define([API_VERSION], m4_bregexp(V_HEADER,
@@ -363,6 +363,137 @@ AC_SUBST(LIB_CFLAGS)
 AC_SUBST(LT_LDFLAGS)
 AC_SUBST(EXEC_LT_LDFLAGS)
 
+dnl ############## Component selection
+
+AC_ARG_ENABLE(components,
+  [AS_HELP_STRING([--disable-components], [(not) build end-user programs with default components, select individual components via --enable-libmpg123 etc.])],
+  [
+    if test "x$enableval" = xyes
+    then
+      build_all=yes
+    else
+      build_all=no
+    fi
+  ],
+  [
+    build_all=yes
+  ]
+)
+
+AC_ARG_ENABLE(programs,
+  [AS_HELP_STRING([--enable-programs], [build (only) programs (with --disable-components)])],
+  [
+    if test "x$enableval" = xyes
+    then
+      build_programs=yes
+    else
+      build_programs=no
+    fi
+  ],
+  [
+    build_programs=no
+  ]
+)
+
+AC_ARG_ENABLE(libmpg123,
+  [AS_HELP_STRING([--enable-libmpg123], [build (only) libmpg123 (with --disable-components)])],
+  [
+    if test "x$enableval" = xyes
+    then
+      build_libmpg123=yes
+    else
+      build_libmpg123=no
+    fi
+  ],
+  [
+    build_libmpg123=no
+  ]
+)
+
+AC_ARG_ENABLE(libout123,
+  [AS_HELP_STRING([--enable-libout123], [build (only) libout123 (with --disable-components)])],
+  [
+    if test "x$enableval" = xyes
+    then
+      build_libout123=yes
+    else
+      build_libout123=no
+    fi
+  ],
+  [
+    build_libout123=no
+  ]
+)
+
+AC_ARG_ENABLE(libout123-modules,
+  [AS_HELP_STRING([--enable-libout123-modules], [build (only) libout123 modules (with --disable-components)])],
+  [
+    if test "x$enableval" = xyes
+    then
+      build_libout123_modules=yes
+    else
+      build_libout123_modules=no
+    fi
+  ],
+  [
+    build_libout123_modules=no
+  ]
+)
+
+AC_ARG_ENABLE(libsyn123,
+  [AS_HELP_STRING([--enable-libsyn123], [build (only) libsyn123 (with --disable-components)])],
+  [
+    if test "x$enableval" = xyes
+    then
+      build_libsyn123=yes
+    else
+      build_libsyn123=no
+    fi
+  ],
+  [
+    build_libsyn123=no
+  ]
+)
+
+if test "x$build_all" = xyes; then
+  build_programs=yes
+  build_libmpg123=yes
+  build_libout123=yes
+  build_libout123_modules=yes
+  build_libsyn123=yes
+fi
+
+AM_CONDITIONAL([BUILD_PROGRAMS],  [ test "x$build_programs" = xyes ])
+AM_CONDITIONAL([BUILD_LIBMPG123], [ test "x$build_libmpg123" = xyes ])
+AM_CONDITIONAL([BUILD_LIBOUT123], [ test "x$build_libout123" = xyes ])
+AM_CONDITIONAL([BUILD_LIBOUT123_MODULES], [ test "x$build_libout123_modules" = xyes ])
+AM_CONDITIONAL([BUILD_LIBOUT123_OR_MODULES], [ test "x$build_libout123" = xyes || test "x$build_libout123_modules" = xyes ])
+AM_CONDITIONAL([BUILD_LIBSYN123], [ test "x$build_libsyn123" = xyes ])
+# If we install libraries, prompting pkgconfig and include directories.
+AM_CONDITIONAL([NEED_LIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libout123_modules" = xyes || test "x$build_libsyn123" = xyes ])
+AM_CONDITIONAL([NEED_MAINLIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libsyn123" = xyes ])
+
+components=""
+
+if test "x$build_programs" = xyes; then
+  components="$components programs"
+fi
+
+if test "x$build_libmpg123" = xyes; then
+  components="$components libmpg123"
+fi
+if test "x$build_libout123" = xyes; then
+  components="$components libout123"
+fi
+if test "x$build_libout123_modules" = xyes; then
+  components="$components libout123-modules"
+fi
+if test "x$build_libsyn123" = xyes; then
+  components="$components libsyn123"
+fi
+
+components=$(echo $components)
+
 dnl ############## Configurable Options
 
 AC_ARG_ENABLE(debug,
@@ -1183,30 +1314,18 @@ AC_SUBST(YASMFLAGS)
 
 dnl ############## Really basic headers, needed for other checks.
 
+AC_MSG_CHECKING([for basic C99 features])
+AC_LINK_IFELSE(
+   [AC_LANG_SOURCE([`cat "$srcdir/test_c99.c"`])],
+   [have_c99=yes; AC_MSG_RESULT([yes])],
+   [have_c99=no; AC_MSG_RESULT([no])]
+)
+if test "x$have_c99" = xno; then
+  AC_MSG_ERROR([Your toolchain lacks basic C99 features. See test_c99.c for the requirements.])
+fi
+
 dnl Is it too paranoid to specifically check for stdint.h and limits.h?
-AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h sched.h sys/ioctl.h sys/types.h stdint.h limits.h inttypes.h sys/time.h sys/wait.h sys/resource.h sys/signal.h signal.h sys/select.h dirent.h sys/stat.h])
+AC_CHECK_HEADERS([unistd.h sched.h sys/ioctl.h sys/types.h sys/time.h sys/wait.h sys/resource.h sys/signal.h signal.h sys/select.h dirent.h sys/stat.h])
-
-dnl ############## Types
-
-# Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf.
-# Re-think this list. Some things just should be a given. We assume C99 now.
-# Rather think about assumptions like int64_t >= ptrdiff_t.
-AC_CHECK_TYPE(size_t, unsigned long)
-AC_CHECK_TYPE(uintptr_t, unsigned long)
-AC_CHECK_TYPE(ssize_t, long)
-AC_CHECK_TYPE(ptrdiff_t, long)
-AC_CHECK_TYPE(int32_t, int)
-AC_CHECK_TYPE(int64_t, long long)
-AC_CHECK_TYPE(uint32_t, unsigned int)
-AC_CHECK_TYPE(int16_t, short)
-AC_CHECK_TYPE(uint16_t, unsigned short)
-AC_CHECK_SIZEOF(size_t)
-AC_CHECK_SIZEOF(ssize_t)
-AC_CHECK_SIZEOF(int32_t)
-AC_CHECK_SIZEOF(long)
-
-# We do not need to know if off_t actually changes size using
-# _FILE_OFFSET_BITS, only need to know what size it has.
 
 dnl ############## LFS stuff
 
@@ -1766,7 +1885,7 @@ fi
 dnl ############## Output module choice
 
 # The full list of supported modules to check, first come, first serve.
-check_modules="pulse alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio sdl nas arts openal dummy"
+check_modules="pulse alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio sdl nas arts openal"
 # Only check qsa before all else on QNX.
 # It would mask ALSA otherwise.
 case $host in
@@ -1782,13 +1901,16 @@ check_forced=no
 check_failed=no
 if test "x$with_audio" != "x"; then
 	check_modules=`echo $with_audio|tr , ' '`
-	if ! echo "$check_modules" | grep -qw dummy; then
-		check_modules="$check_modules dummy"
-	fi
 	echo "Limiting outputs to build according to your preference: $check_modules"
 	check_forced=yes
 fi
 
+# Dummy output module is always built alongside libout123, but not
+# when just building the modules.
+if test "x$build_libout123" = xyes && ! echo "$check_modules" | grep -qw dummy; then
+	check_modules="$check_modules dummy"
+fi
+
 PKG_PROG_PKG_CONFIG([])
 
 # Now go through the modules to check and do the chores.
@@ -2787,119 +2909,6 @@ if test x"$ipv6" = xenabled; then
 	fi
 fi
 
-dnl ############## Component selection
-
-AC_ARG_ENABLE(components,
-  [AS_HELP_STRING([--disable-components], [(not) build end-user programs with default components, select individual components via --enable-libmpg123 etc.])],
-  [
-    if test "x$enableval" = xyes
-    then
-      build_all=yes
-    else
-      build_all=no
-    fi
-  ],
-  [
-    build_all=yes
-  ]
-)
-
-AC_ARG_ENABLE(libmpg123,
-  [AS_HELP_STRING([--enable-libmpg123], [build (only) libmpg123 (with --disable-components)])],
-  [
-    if test "x$enableval" = xyes
-    then
-      build_libmpg123=yes
-    else
-      build_libmpg123=no
-    fi
-  ],
-  [
-    build_libmpg123=no
-  ]
-)
-
-AC_ARG_ENABLE(libout123,
-  [AS_HELP_STRING([--enable-libout123], [build (only) libout123 (with --disable-components)])],
-  [
-    if test "x$enableval" = xyes
-    then
-      build_libout123=yes
-    else
-      build_libout123=no
-    fi
-  ],
-  [
-    build_libout123=no
-  ]
-)
-
-AC_ARG_ENABLE(libout123-modules,
-  [AS_HELP_STRING([--enable-libout123-modules], [build (only) libout123 modules (with --disable-components)])],
-  [
-    if test "x$enableval" = xyes
-    then
-      build_libout123_modules=yes
-    else
-      build_libout123_modules=no
-    fi
-  ],
-  [
-    build_libout123_modules=no
-  ]
-)
-
-AC_ARG_ENABLE(libsyn123,
-  [AS_HELP_STRING([--enable-libsyn123], [build (only) libsyn123 (with --disable-components)])],
-  [
-    if test "x$enableval" = xyes
-    then
-      build_libsyn123=yes
-    else
-      build_libsyn123=no
-    fi
-  ],
-  [
-    build_libsyn123=no
-  ]
-)
-
-if test "x$build_all" = xyes; then
-  build_programs=yes
-  build_libmpg123=yes
-  build_libout123=yes
-  build_libout123_modules=yes
-  build_libsyn123=yes
-  components="programs"
-else
-  build_programs=no
-fi
-
-AM_CONDITIONAL([BUILD_PROGRAMS],  [ test "x$build_programs" = xyes ])
-AM_CONDITIONAL([BUILD_LIBMPG123], [ test "x$build_libmpg123" = xyes ])
-AM_CONDITIONAL([BUILD_LIBOUT123], [ test "x$build_libout123" = xyes ])
-AM_CONDITIONAL([BUILD_LIBOUT123_MODULES], [ test "x$build_libout123_modules" = xyes ])
-AM_CONDITIONAL([BUILD_LIBSYN123], [ test "x$build_libsyn123" = xyes ])
-AM_CONDITIONAL([NEED_FMT123], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libsyn123" = xyes ])
-# If we install libraries, prompting pkgconfig and include directories.
-AM_CONDITIONAL([NEED_LIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libout123_modules" = xyes || test "x$build_libsyn123" = xyes ])
-AM_CONDITIONAL([NEED_MAINLIB], [ test "x$build_libmpg123" = xyes || test "x$build_libout123" = xyes || test "x$build_libsyn123" = xyes ])
-
-
-if test "x$build_libmpg123" = xyes; then
-  components="$components libmpg123"
-fi
-if test "x$build_libout123" = xyes; then
-  components="$components libout123"
-fi
-if test "x$build_libout123_modules" = xyes; then
-  components="$components libout123-modules"
-fi
-if test "x$build_libsyn123" = xyes; then
-  components="$components libsyn123"
-fi
-components=$(echo $components)
-
 dnl ############## Library cleanup
 
 PROG_LIBS=$LIBS
@@ -3021,6 +3030,14 @@ if test x"$cpu_type" = xi486; then
   echo "only."
 fi
 
+if test "x$use_extlib" = xyes; then
+  echo
+  echo "Warning: You opted to use external builds of the mpg123 libraries. They need to"
+  echo "         match the headers shipped with this source (which are used during build"
+  echo "         regardless)."
+  echo
+fi
+
 echo
 echo "  CPPFLAGS='$CPPFLAGS'"
 echo "  CFLAGS='$CFLAGS'"

doc/doxygen.conf

@@ -17,10 +17,10 @@ INPUT = \
 	examples/feedseek.c \
 	examples/extract_frames.c \
 	examples/id3dump.c \
-	../src/libmpg123/mpg123.h \
+	../src/include/mpg123.h \
-	../src/libmpg123/fmt123.h \
+	../src/include/fmt123.h \
-	../src/libout123/out123.h \
+	../src/include/out123.h \
-	../src/libsyn123/syn123.h \
+	../src/include/syn123.h \
 #OPTIMIZE_OUTPUT_FOR_C	= YES
 EXTRACT_ALL				= NO
 HIDE_UNDOC_MEMBERS		= NO

mpg123.spec

@@ -3,7 +3,7 @@
 # - devel packages for alsa, sdl, etc... to build the respective output modules.
 Summary:	The fast console mpeg audio decoder/player.
 Name:		mpg123
-Version:	1.32.3
+Version:	1.32.4
 Release:	1
 URL:		http://www.mpg123.org/
 License:	GPL

ports/cmake/src/CMakeLists.txt

@@ -14,18 +14,12 @@ option(PORTABLE_API "Only build portable library API (no off_t, no internal I/O.
 check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
 check_include_file("dirent.h" HAVE_DIRENT_H)
 check_include_file("dlfcn.h" HAVE_DLFCN_H)
-check_include_file("inttypes.h" HAVE_INTTYPES_H)
 check_include_file("langinfo.h" HAVE_LANGINFO_H)
-check_include_file("limits.h" HAVE_LIMITS_H)
 check_include_file("locale.h" HAVE_LOCALE_H)
 check_include_file("netdb.h" HAVE_NETDB_H)
 check_include_file("netinet/in.h" HAVE_NETINET_IN_H)
 check_include_file("sched.h" HAVE_SCHED_H)
 check_include_file("signal.h" HAVE_SIGNAL_H)
-check_include_file("stdio.h" HAVE_STDIO_H)
-check_include_file("stdint.h" HAVE_STDINT_H)
-check_include_file("stdlib.h" HAVE_STDLIB_H)
-check_include_file("string.h" HAVE_STRING_H)
 check_include_file("strings.h" HAVE_STRINGS_H)
 check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H)
 check_include_file("sys/ipc.h" HAVE_SYS_IPC_H)
@@ -70,7 +64,6 @@ check_function_exists(execvp HAVE_EXECVP)
 check_function_exists(ctermid HAVE_CTERMID)
 check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
 
-check_type_size(long SIZEOF_LONG)
 check_type_size(off_t SIZEOF_OFF_T)
 
 if(SIZEOF_OFF_T LESS 8)
@@ -135,8 +128,6 @@ if(NOT LFS_INSENSITIVE)
         int main() { return 0; }"
         LFS_SENSITIVE)
 endif()
-check_type_size(long SIZEOF_LONG)
-check_type_size(off_t SIZEOF_OFF_T)
 
 if(WIN32 AND HAVE_WINDOWS_H)
     check_function_exists(GetThreadErrorMode HAVE_GETTHREADERRORMODE)
@@ -350,10 +341,7 @@ option(USE_NEW_HUFFTABLE "use new huffman decoding scheme by Taihei (faster on m
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/"
     "${CMAKE_CURRENT_BINARY_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/compat"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/include")
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libsyn123"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libout123"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/libmpg123")
 
 add_compile_definitions(
     $<$<BOOL:${WIN32}>:_CRT_SECURE_NO_WARNINGS>

ports/cmake/src/config.cmake.h.in

@@ -33,7 +33,6 @@
 #cmakedefine HAVE_DLFCN_H 1
 #cmakedefine HAVE_INTTYPES_H 1
 #cmakedefine HAVE_LANGINFO_H 1
-#cmakedefine HAVE_LIMITS_H 1
 #cmakedefine HAVE_LOCALE_H 1
 #cmakedefine HAVE_NL_LANGINFO 1
 #cmakedefine HAVE_RANDOM 1
@@ -42,16 +41,12 @@
 #cmakedefine HAVE_USELOCALE 1
 #cmakedefine HAVE_SETPRIORITY 1
 #cmakedefine HAVE_SIGNAL_H 1
-#cmakedefine HAVE_STDIO_H 1
-#cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_STDLIB_H 1
 #cmakedefine HAVE_STRERROR 1
 #cmakedefine HAVE_STRERROR_L 1
 #cmakedefine HAVE_FORK 1
 #cmakedefine HAVE_EXECVP 1
 #cmakedefine HAVE_CTERMID 1
 #cmakedefine HAVE_CLOCK_GETTIME 1
-#cmakedefine HAVE_STRING_H 1
 #cmakedefine HAVE_STRINGS_H 1
 #cmakedefine HAVE_SYS_IOCTL_H 1
 #cmakedefine HAVE_SYS_RESOURCE_H 1
@@ -149,9 +144,7 @@
 #define PKGLIBDIR "@CMAKE_INSTALL_LIBDIR@/@PROJECT_NAME@"
 
 // CMake leaves it emtpy for non-existing type. Autoconf sets it to 0.
-#define SIZEOF_LONG (@SIZEOF_LONG@+0)
 #define SIZEOF_OFF_T (@SIZEOF_OFF_T@+0)
-#define SIZEOF_OFF64_T (@SIZEOF_OFF64_T@+0)
 
 #cmakedefine STDERR_FILENO @STDERR_FILENO@
 #cmakedefine STDIN_FILENO @STDIN_FILENO@

ports/cmake/src/libmpg123/CMakeLists.txt

@@ -252,8 +252,8 @@ install(TARGETS ${TARGET} EXPORT targets
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libmpg123/mpg123.h"
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/include/mpg123.h"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libmpg123/fmt123.h"
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/include/fmt123.h"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 

ports/cmake/src/libout123/CMakeLists.txt

@@ -31,5 +31,5 @@ install(TARGETS ${TARGET} EXPORT targets
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libout123/out123.h"
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/include/out123.h"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

ports/cmake/src/libsyn123/CMakeLists.txt

@@ -26,5 +26,5 @@ install(TARGETS ${TARGET} EXPORT targets
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/"
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/libsyn123/syn123.h"
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/include/syn123.h"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

src/Makemodule.am

@@ -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 \
+  $(LIBMPG123) \
-  src/libout123/libout123.la \
+  $(LIBOUT123) \
-  src/libsyn123/libsyn123.la \
+  $(LIBSYN123) \
   @PROG_LIBS@
 
 src_mpg123_LDFLAGS = @EXEC_LT_LDFLAGS@
 
 src_out123_LDADD = \
   src/compat/libcompat.la \
-  src/libsyn123/libsyn123.la \
+  $(LIBSYN123) \
-  src/libout123/libout123.la \
+  $(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 = \

src/audio.c

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

src/audio.h

@@ -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"
 

src/common.c

@@ -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));
+			memcpy(framefmt, "%05" PRIiMAX, sizeof("%05" PRIiMAX));
-		snprintf( framestr[0], sizeof(framestr[0])-1, framefmt, (off_p)frame);
+		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. */

src/common/Makemodule.am

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

src/compat/compat.c

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

src/compat/compat.h

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

src/compat/compat_dl.c

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

src/compat/compat_str.c

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

src/config.h.in

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

src/control_generic.c

@@ -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 */

src/equalizer.c

@@ -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. 

src/filters.c

@@ -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.

src/filters.h

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

src/getlopt.c

@@ -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] */

src/httpget.c

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

src/include/mpg123.h

@@ -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.

src/include/out123.h

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

src/include/syn123.h

@@ -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.

src/libmpg123/Makemodule.am

@@ -20,10 +20,7 @@ src_libmpg123_calctables_LDADD = @LIBM@
 
 if BUILD_LIBMPG123
 lib_LTLIBRARIES += src/libmpg123/libmpg123.la
-include_HEADERS += src/libmpg123/mpg123.h
+include_HEADERS += src/include/mpg123.h
-endif
-if NEED_FMT123
-include_HEADERS += src/libmpg123/fmt123.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 \

src/libmpg123/calctables.c

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

src/libmpg123/decode.h

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

src/libmpg123/dither_impl.h

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

src/libmpg123/format.c

@@ -26,8 +26,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.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)
 {

src/libmpg123/frame.c

@@ -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
+				merror("have external buffer of size %zu, need %zu", fr->buffer.size, size);
-				,	(size_p)fr->buffer.size, (size_p)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)

src/libmpg123/frame.h

@@ -167,11 +167,9 @@ struct mpg123_handle_struct
 	{
 #ifdef OPT_MULTI
 
-#ifndef NO_LAYER3
+#ifdef OPT_THE_DCT36
-#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)
 		void (*the_dct36)(real *,real *,real *,const real *,real *);
 #endif
-#endif
 
 #endif
 		enum optdec type;

src/libmpg123/gapless.h

@@ -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"
+				 PRIi64 " samples, fill now %zu bytes.\n"
-			,	fr->num, (fr->num == fr->lastframe ? fr->lastoff : 0), (size_p)fr->buffer.fill);
+			,	fr->num, (fr->num == fr->lastframe ? fr->lastoff : 0), fr->buffer.fill);
 	}
 
 	/* The first interesting frame: Skip some leading samples. */

src/libmpg123/getbits.h

@@ -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, \

src/libmpg123/icy.h

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

src/libmpg123/icy2utf8.c

@@ -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. */

src/libmpg123/id3.c

@@ -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 desc of length %zu.\n", 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 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)

src/libmpg123/index.c

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

src/libmpg123/index.h

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

src/libmpg123/layer1.c

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

src/libmpg123/layer3.c

@@ -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
 */
-
+static void INT123_dct36(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf)
-/* 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)
 {
 	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)

src/libmpg123/lfs_wrap.c

@@ -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 "../common/abi_align.h"
-#include "compat.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

src/libmpg123/libmpg123.c

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

src/libmpg123/mpg123lib_intern.h

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

src/libmpg123/ntom.c

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

src/libmpg123/optimize.c

@@ -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
+#	ifdef OPT_THE_DCT36
-	if(fr->cpu_opts.the_dct36 == INT123_dct36_sse)
+	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)
 	{

src/libmpg123/optimize.h

@@ -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 */
 

src/libmpg123/parse.c

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

src/libmpg123/readers.c

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

src/libmpg123/stringbuf.c

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

src/libmpg123/synth.c

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

src/libmpg123/synth_8bit.c

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

src/libmpg123/synth_real.c

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

src/libmpg123/synth_s32.c

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

src/libmpg123/tabinit.c

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

src/libout123/Makemodule.am

@@ -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 \

src/libout123/buffer.c

@@ -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)."
+			debug4( "Play or preload? Got %zu B / %zu B (%i,%i)."
-			,	(size_p)bytes, (size_p)preload_size(ao), preloading, draining );
+			,	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")"
+						debug2("responding with %i formats (block: %zu)", fmtcount, blocksize);
-						, fmtcount, (size_p)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
+						debug2("buffer drained %zu / %zu", oldfill-bytes, limit);
-						,	oldfill-bytes, limit );
 					}
 					else
 						debug("drain without playback ... not good");

src/libout123/buffer.h

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

src/libout123/hextxt.c

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

src/libout123/legacy_module.c

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

src/libout123/libout123.c

@@ -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()
+	debug5( "[%ld]out123_play(%p, %p, %zu) (%i)", (long)getpid()
-	,	(void*)ao, bytes, (size_p)count, ao ? (int)ao->state : -1 );
+	,	(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
+	debug3( "out123_play(%p, %p, ...) = %zu"
-	,	(void*)ao, bytes, (size_p)sum );
+	,	(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

src/libout123/module.c

@@ -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?

src/libout123/modules/Makemodule.am

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

src/libout123/modules/aix.c

@@ -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
  */

src/libout123/modules/alib.c

@@ -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"
 
 /**************************************************************************/
 

src/libout123/modules/alsa.c

@@ -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. */

src/libout123/modules/arts.c

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

src/libout123/modules/coreaudio.c

@@ -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?

src/libout123/modules/dummy.c

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

src/libout123/modules/esd.c

@@ -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,						

src/libout123/modules/hp.c

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

src/libout123/modules/jack.c

@@ -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")"
+		debug2("fetched %zu frames from ringbuffer (wanted %zu)", got_piece, piece);
-		,	(size_p)got_piece, (size_p)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"
+		debug2( "JACK close wait %zu < %zu\n"
-		,	(size_p)jack_ringbuffer_write_space(handle->rb)
+		,	jack_ringbuffer_write_space(handle->rb)
-		,	(size_p)handle->rb_size );
+		,	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. 

src/libout123/modules/mint.c

@@ -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; */

src/libout123/modules/nas.c

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

src/libout123/modules/openal.c

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

src/libout123/modules/os2.c

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

src/libout123/modules/oss.c

@@ -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,

src/libout123/modules/portaudio.c

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

src/libout123/modules/pulse.c

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

src/libout123/modules/qsa.c

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

src/libout123/modules/sdl.c

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

src/libout123/modules/sgi.c

@@ -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 <errno.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 static int set_rate(out123_handle *ao, ALconfig config)
 {

src/libout123/modules/sndio.c

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

src/libout123/modules/sun.c

@@ -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,						

src/libout123/modules/tinyalsa.c

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

src/libout123/modules/win32.c

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

src/libout123/modules/win32_wasapi.c

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

src/libout123/out123_int.h

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