lame-cvs — cvs logs

[Lame-cvs] SF.net SVN: lame:[6481] trunk/lame/configure

[<ale...@us...>]

Revision: 6481
          http://sourceforge.net/p/lame/svn/6481
Author:   aleidinger
Date:     2021-03-09 11:25:19 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
regen

Modified Paths:
--------------
    trunk/lame/configure

Modified: trunk/lame/configure
===================================================================
--- trunk/lame/configure	2021-03-09 11:24:55 UTC (rev 6480)
+++ trunk/lame/configure	2021-03-09 11:25:19 UTC (rev 6481)
@@ -18434,7 +18434,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile"
+ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile vc_solution/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -19492,9 +19492,6 @@
     "ACM/tinyxml/Makefile") CONFIG_FILES="$CONFIG_FILES ACM/tinyxml/Makefile" ;;
     "lame.spec") CONFIG_FILES="$CONFIG_FILES lame.spec" ;;
     "mac/Makefile") CONFIG_FILES="$CONFIG_FILES mac/Makefile" ;;
-    "macosx/Makefile") CONFIG_FILES="$CONFIG_FILES macosx/Makefile" ;;
-    "macosx/English.lproj/Makefile") CONFIG_FILES="$CONFIG_FILES macosx/English.lproj/Makefile" ;;
-    "macosx/LAME.xcodeproj/Makefile") CONFIG_FILES="$CONFIG_FILES macosx/LAME.xcodeproj/Makefile" ;;
     "vc_solution/Makefile") CONFIG_FILES="$CONFIG_FILES vc_solution/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

[Lame-cvs] SF.net SVN: lame:[6480] trunk/lame/configure.in

[<ale...@us...>]

Revision: 6480
          http://sourceforge.net/p/lame/svn/6480
Author:   aleidinger
Date:     2021-03-09 11:24:55 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
remove macosx xcode directory

Modified Paths:
--------------
    trunk/lame/configure.in

Modified: trunk/lame/configure.in
===================================================================
--- trunk/lame/configure.in	2021-03-09 11:04:50 UTC (rev 6479)
+++ trunk/lame/configure.in	2021-03-09 11:24:55 UTC (rev 6480)
@@ -1291,9 +1291,6 @@
 		 ACM/tinyxml/Makefile \
 		 lame.spec \
 		 mac/Makefile \
-		 macosx/Makefile \
-		 macosx/English.lproj/Makefile \
-		 macosx/LAME.xcodeproj/Makefile \
 		 vc_solution/Makefile])
 
 AC_OUTPUT

[Lame-cvs] SF.net SVN: lame:[6479] trunk/lame

[<ale...@us...>]

Revision: 6479
          http://sourceforge.net/p/lame/svn/6479
Author:   aleidinger
Date:     2021-03-09 11:04:50 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
Remove xcode project, nobody stepped up to adapt it for the libmpg123 changes.

Modified Paths:
--------------
    trunk/lame/Makefile.am

Removed Paths:
-------------
    trunk/lame/macosx/

Modified: trunk/lame/Makefile.am
===================================================================
--- trunk/lame/Makefile.am	2021-03-09 10:52:45 UTC (rev 6478)
+++ trunk/lame/Makefile.am	2021-03-09 11:04:50 UTC (rev 6479)
@@ -5,7 +5,7 @@
 .PHONY: test
 
 SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM \
-	mac macosx vc_solution
+	mac vc_solution
 
 CLEANFILES = testcase.new.mp3
 

[Lame-cvs] SF.net SVN: lame:[6478] trunk/lame

[<ale...@us...>]

Revision: 6478
          http://sourceforge.net/p/lame/svn/6478
Author:   aleidinger
Date:     2021-03-09 10:52:45 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
regen

Modified Paths:
--------------
    trunk/lame/ACM/ADbg/Makefile.in
    trunk/lame/ACM/Makefile.in
    trunk/lame/ACM/ddk/Makefile.in
    trunk/lame/ACM/tinyxml/Makefile.in
    trunk/lame/Dll/Makefile.in
    trunk/lame/Makefile.in
    trunk/lame/doc/Makefile.in
    trunk/lame/doc/html/Makefile.in
    trunk/lame/doc/man/Makefile.in
    trunk/lame/dshow/Makefile.in
    trunk/lame/frontend/Makefile.in
    trunk/lame/include/Makefile.in
    trunk/lame/libmp3lame/Makefile.in
    trunk/lame/libmp3lame/i386/Makefile.in
    trunk/lame/libmp3lame/vector/Makefile.in
    trunk/lame/mac/Makefile.in
    trunk/lame/macosx/English.lproj/Makefile.in
    trunk/lame/macosx/LAME.xcodeproj/Makefile.in
    trunk/lame/macosx/Makefile.in
    trunk/lame/misc/Makefile.in
    trunk/lame/mpglib/Makefile.in
    trunk/lame/vc_solution/Makefile.in

Modified: trunk/lame/ACM/ADbg/Makefile.in
===================================================================
--- trunk/lame/ACM/ADbg/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/ACM/ADbg/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/ACM/Makefile.in
===================================================================
--- trunk/lame/ACM/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/ACM/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/ACM/ddk/Makefile.in
===================================================================
--- trunk/lame/ACM/ddk/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/ACM/ddk/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/ACM/tinyxml/Makefile.in
===================================================================
--- trunk/lame/ACM/tinyxml/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/ACM/tinyxml/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/Dll/Makefile.in
===================================================================
--- trunk/lame/Dll/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/Dll/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/Makefile.in
===================================================================
--- trunk/lame/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.
@@ -202,6 +202,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -697,7 +699,7 @@
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \

Modified: trunk/lame/doc/Makefile.in
===================================================================
--- trunk/lame/doc/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/doc/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/doc/html/Makefile.in
===================================================================
--- trunk/lame/doc/html/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/doc/html/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/doc/man/Makefile.in
===================================================================
--- trunk/lame/doc/man/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/doc/man/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/dshow/Makefile.in
===================================================================
--- trunk/lame/dshow/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/dshow/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/frontend/Makefile.in
===================================================================
--- trunk/lame/frontend/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/frontend/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/include/Makefile.in
===================================================================
--- trunk/lame/include/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/include/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/libmp3lame/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/libmp3lame/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/libmp3lame/i386/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/i386/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/libmp3lame/i386/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/libmp3lame/vector/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/vector/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/libmp3lame/vector/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/mac/Makefile.in
===================================================================
--- trunk/lame/mac/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/mac/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/macosx/English.lproj/Makefile.in
===================================================================
--- trunk/lame/macosx/English.lproj/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/macosx/English.lproj/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/macosx/LAME.xcodeproj/Makefile.in
===================================================================
--- trunk/lame/macosx/LAME.xcodeproj/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/macosx/LAME.xcodeproj/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/macosx/Makefile.in
===================================================================
--- trunk/lame/macosx/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/macosx/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/misc/Makefile.in
===================================================================
--- trunk/lame/misc/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/misc/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/mpglib/Makefile.in
===================================================================
--- trunk/lame/mpglib/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/mpglib/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

Modified: trunk/lame/vc_solution/Makefile.in
===================================================================
--- trunk/lame/vc_solution/Makefile.in	2021-03-09 10:52:15 UTC (rev 6477)
+++ trunk/lame/vc_solution/Makefile.in	2021-03-09 10:52:45 UTC (rev 6478)
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2020 Free Software Foundation, Inc.

[Lame-cvs] SF.net SVN: lame:[6477] trunk/lame/configure

[<ale...@us...>]

Revision: 6477
          http://sourceforge.net/p/lame/svn/6477
Author:   aleidinger
Date:     2021-03-09 10:52:15 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
regen

Modified Paths:
--------------
    trunk/lame/configure

Modified: trunk/lame/configure
===================================================================
--- trunk/lame/configure	2021-03-09 10:52:04 UTC (rev 6476)
+++ trunk/lame/configure	2021-03-09 10:52:15 UTC (rev 6477)
@@ -2847,12 +2847,7 @@
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -18123,10 +18118,6 @@
 					OPTIMIZATION="${OPTIMIZATION} -march=i686 \
 						-mtune=native"
 					;;
-				*86)
-					OPTIMIZATION="${OPTIMIZATION} -march=native \
-						-mtune=native"
-					;;
 				arm*-gnueabi)
 					if  -z "$(echo ${GCC_version} | awk '/4\.0/')" ; then
 						# Work round buggy softfloat optimization in ARM EABI compilers
@@ -18176,12 +18167,12 @@
 			OPTIMIZATION="${OPTIMIZATION} -march=i686 \
 				-mtune=native"
 			;;
-		*86)
-			OPTIMIZATION="${OPTIMIZATION} -march=native \
-				-mtune=native"
-			;;
 		esac
 
+		# if someone supplies own CFLAGS, we don't add our own
+		if test "x${ac_save_CFLAGS}" != "x"; then
+			OPTIMIZATION=""
+		fi
 	fi
 
 

[Lame-cvs] SF.net SVN: lame:[6476] trunk/lame/aclocal.m4

[<ale...@us...>]

Revision: 6476
          http://sourceforge.net/p/lame/svn/6476
Author:   aleidinger
Date:     2021-03-09 10:52:04 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
regen

Modified Paths:
--------------
    trunk/lame/aclocal.m4

Modified: trunk/lame/aclocal.m4
===================================================================
--- trunk/lame/aclocal.m4	2021-03-09 10:35:26 UTC (rev 6475)
+++ trunk/lame/aclocal.m4	2021-03-09 10:52:04 UTC (rev 6476)
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
 
 # Copyright (C) 1996-2020 Free Software Foundation, Inc.
 
@@ -11664,7 +11664,7 @@
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.2], [],
+m4_if([$1], [1.16.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -11680,7 +11680,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.16.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -12391,12 +12391,7 @@
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then

[Lame-cvs] SF.net SVN: lame:[6475] trunk/lame/configure.in

[<ale...@us...>]

Revision: 6475
          http://sourceforge.net/p/lame/svn/6475
Author:   aleidinger
Date:     2021-03-09 10:35:26 +0000 (Tue, 09 Mar 2021)
Log Message:
-----------
- Remove cases which matches all previous cases, this was not intended.
- In the clang case, do the same as for gcc, if someone provied CFLAGS on his own,
  do not add flags on our own.

Modified Paths:
--------------
    trunk/lame/configure.in

Modified: trunk/lame/configure.in
===================================================================
--- trunk/lame/configure.in	2020-08-25 10:24:34 UTC (rev 6474)
+++ trunk/lame/configure.in	2021-03-09 10:35:26 UTC (rev 6475)
@@ -971,10 +971,6 @@
 					OPTIMIZATION="${OPTIMIZATION} -march=i686 \
 						-mtune=native"
 					;;
-				*86)
-					OPTIMIZATION="${OPTIMIZATION} -march=native \
-						-mtune=native"
-					;;
 				arm*-gnueabi)
 					if [ -z "$(echo ${GCC_version} | awk '/4\.0/')" ]; then
 						# Work round buggy softfloat optimization in ARM EABI compilers
@@ -1022,12 +1018,12 @@
 			OPTIMIZATION="${OPTIMIZATION} -march=i686 \
 				-mtune=native"
 			;;
-		*86)
-			OPTIMIZATION="${OPTIMIZATION} -march=native \
-				-mtune=native"
-			;;
 		esac
 
+		# if someone supplies own CFLAGS, we don't add our own
+		if test "x${ac_save_CFLAGS}" != "x"; then
+			OPTIMIZATION=""
+		fi
 	fi
 
 

[Lame-cvs] SF.net SVN: lame:[6474] trunk/lame/vc_solution

[<ale...@us...>]

Revision: 6474
          http://sourceforge.net/p/lame/svn/6474
Author:   aleidinger
Date:     2020-08-25 10:24:34 +0000 (Tue, 25 Aug 2020)
Log Message:
-----------
Add 64-bit support.

Submitted by:	Michael Fink via [patches:#94]

Modified Paths:
--------------
    trunk/lame/vc_solution/README.vs2019.txt
    trunk/lame/vc_solution/vs2019_lame.sln
    trunk/lame/vc_solution/vs2019_lame_config.props
    trunk/lame/vc_solution/vs2019_lame_lame.vcxproj
    trunk/lame/vc_solution/vs2019_libmp3lame.vcxproj
    trunk/lame/vc_solution/vs2019_libmp3lame_dll.vcxproj
    trunk/lame/vc_solution/vs2019_libmpg123_config.props
    trunk/lame/vc_solution/vs2019_libsndfile_config.props

Modified: trunk/lame/vc_solution/README.vs2019.txt
===================================================================
--- trunk/lame/vc_solution/README.vs2019.txt	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/README.vs2019.txt	2020-08-25 10:24:34 UTC (rev 6474)
@@ -29,6 +29,13 @@
 - ReleaseNASM: Uses NASM (see below) to compile some routines using NASM
 - ReleaseSSE2: Uses SSE2 assembler instructions to optimize routines
 
+The vs2019_lame.sln solution has both Win32 and x64 platforms configured, in
+order to compile lame.exe and the libmp3lame.dll for 32-bit or 64-bit target
+platforms. The output folder also has separate folders for the two platforms.
+Note that mp3rtp and mp3x are not compiled in x64. Also note that all 64-bit
+processors have SSE2 instructions, so the /arch:SSE2 option is ignored for
+this platform.
+
 ## External libraries and tools
 
 For some projects, external libraries or tools are necessary for successful
@@ -70,11 +77,17 @@
 As described above, you can also use the Property Manager view to change the
 values.
 
+Note that when compiling for the x64 platform, you have to use the 64-bit
+version of libsndfile. Alternatively you can use the `HaveLibsndfile` as is
+(the default value is `.\libsndfile\$(Platform)\`) and extract the zip
+archives for 32-bit and 64-bit into the "vc_solution\libsndfile\Win32\" and
+"vc_solution\libsndfile\x64\" folders.
+
 ### mpg123
 
 From LAME version 3.100.1 on, LAME supports decoding using the external mpg123
 library, which is a mature fork of the internally used mpglib library. The
-latest binaries for Win32 are available here:
+latest binaries for Win32 and x64 are available here:
 https://mpg123.de/
 
 Open the file "lame/vc_solution/vs2019_libmpg123_config.props" and edit the
@@ -91,6 +104,12 @@
 As described above, you can also use the Property Manager view to change the
 values.
 
+Note that when compiling for the x64 platform, you have to use the 64-bit
+version of libmpg123. Alternatively you can use the `HaveMpg123` as is
+(the default value is `.\mpg123\$(Platform)\`) and extract the zip
+archives for 32-bit and 64-bit into the "vc_solution\mpg123\Win32\" and
+"vc_solution\mpg123\x64\" folders.
+
 ### GTK1
 
 The mp3x graphical frame analyzer uses GTK1 for the user interface. One of the
@@ -105,6 +124,8 @@
 As described above, you can also use the Property Manager view to change the
 values.
 
+Note that compiling mp3x for 64-bit platforms is currently not available.
+
 ### Windows SDK 7.1
 
 For the DirectShow filter, the Windows SDK 7.1 is needed, especially the

Modified: trunk/lame/vc_solution/vs2019_lame.sln
===================================================================
--- trunk/lame/vc_solution/vs2019_lame.sln	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_lame.sln	2020-08-25 10:24:34 UTC (rev 6474)
@@ -21,51 +21,84 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 		ReleaseNASM|Win32 = ReleaseNASM|Win32
+		ReleaseNASM|x64 = ReleaseNASM|x64
 		ReleaseSSE2|Win32 = ReleaseSSE2|Win32
+		ReleaseSSE2|x64 = ReleaseSSE2|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|Win32.Build.0 = Debug|Win32
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|x64.ActiveCfg = Debug|x64
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|x64.Build.0 = Debug|x64
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|Win32.ActiveCfg = Release|Win32
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|Win32.Build.0 = Release|Win32
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|x64.ActiveCfg = Release|x64
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|x64.Build.0 = Release|x64
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseNASM|x64.ActiveCfg = ReleaseNASM|x64
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
 		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseSSE2|x64.ActiveCfg = ReleaseSSE2|x64
+		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseSSE2|x64.Build.0 = ReleaseSSE2|x64
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.ActiveCfg = Debug|Win32
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.Build.0 = Debug|Win32
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|x64.ActiveCfg = Debug|x64
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|x64.Build.0 = Debug|x64
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.ActiveCfg = Release|Win32
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.Build.0 = Release|Win32
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|x64.ActiveCfg = Release|x64
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|x64.Build.0 = Release|x64
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|x64.ActiveCfg = ReleaseNASM|x64
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|x64.ActiveCfg = ReleaseSSE2|x64
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|x64.Build.0 = ReleaseSSE2|x64
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.Build.0 = Debug|Win32
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|x64.ActiveCfg = Debug|x64
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|x64.Build.0 = Debug|x64
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.ActiveCfg = Release|Win32
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.Build.0 = Release|Win32
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|x64.ActiveCfg = Release|x64
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|x64.Build.0 = Release|x64
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|x64.ActiveCfg = ReleaseNASM|x64
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
 		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|x64.ActiveCfg = ReleaseSSE2|x64
+		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|x64.Build.0 = ReleaseSSE2|x64
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Debug|Win32.Build.0 = Debug|Win32
+		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Debug|x64.ActiveCfg = Debug|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Release|Win32.ActiveCfg = Release|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Release|Win32.Build.0 = Release|Win32
+		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Release|x64.ActiveCfg = Release|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
+		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseNASM|x64.ActiveCfg = ReleaseNASM|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
 		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseSSE2|x64.ActiveCfg = ReleaseSSE2|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Debug|Win32.Build.0 = Debug|Win32
+		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Debug|x64.ActiveCfg = Debug|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Release|Win32.ActiveCfg = Release|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Release|Win32.Build.0 = Release|Win32
+		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Release|x64.ActiveCfg = Release|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
+		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseNASM|x64.ActiveCfg = ReleaseNASM|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
 		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseSSE2|x64.ActiveCfg = ReleaseSSE2|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/lame/vc_solution/vs2019_lame_config.props
===================================================================
--- trunk/lame/vc_solution/vs2019_lame_config.props	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_lame_config.props	2020-08-25 10:24:34 UTC (rev 6474)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <OutDir>$(SolutionDir)..\output\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\obj\$(Configuration)\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)..\output\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup>

Modified: trunk/lame/vc_solution/vs2019_lame_lame.vcxproj
===================================================================
--- trunk/lame/vc_solution/vs2019_lame_lame.vcxproj	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_lame_lame.vcxproj	2020-08-25 10:24:34 UTC (rev 6474)
@@ -5,18 +5,34 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseNASM|Win32">
       <Configuration>ReleaseNASM</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseNASM|x64">
+      <Configuration>ReleaseNASM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseSSE2|Win32">
       <Configuration>ReleaseSSE2</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseSSE2|x64">
+      <Configuration>ReleaseSSE2</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>lame</ProjectName>
@@ -30,21 +46,41 @@
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -55,6 +91,13 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_sse2.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_libsndfile_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_sse2.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -62,6 +105,13 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_x87.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_libsndfile_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_x87.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -69,6 +119,13 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_x87.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_libsndfile_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_x87.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -76,6 +133,13 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_nasm.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_libsndfile_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_nasm.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">
     <ClCompile>
@@ -95,6 +159,24 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;../libmp3lame;../include;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WIN32;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_APP=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -110,6 +192,21 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../;../libmp3lame;../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WIN32;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;_APP=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -128,6 +225,24 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;../libmp3lame;../include;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WIN32;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_APP=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -146,6 +261,24 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>..;../libmp3lame;../include;../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WIN32;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;_APP=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\frontend\brhist.c" />
     <ClCompile Include="..\frontend\console.c" />

Modified: trunk/lame/vc_solution/vs2019_libmp3lame.vcxproj
===================================================================
--- trunk/lame/vc_solution/vs2019_libmp3lame.vcxproj	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_libmp3lame.vcxproj	2020-08-25 10:24:34 UTC (rev 6474)
@@ -5,18 +5,34 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseNASM|Win32">
       <Configuration>ReleaseNASM</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseNASM|x64">
+      <Configuration>ReleaseNASM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseSSE2|Win32">
       <Configuration>ReleaseSSE2</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseSSE2|x64">
+      <Configuration>ReleaseSSE2</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>libmp3lame-static</ProjectName>
@@ -30,21 +46,41 @@
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="vs2019_nasm.props" />
@@ -55,6 +91,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_sse2.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_sse2.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -61,6 +103,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_x87.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_x87.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -67,6 +115,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_x87.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_x87.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -73,6 +127,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_nasm.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_nasm.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">
     <ClCompile>
@@ -85,6 +145,17 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -96,6 +167,17 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -104,6 +186,14 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -115,6 +205,17 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\libmp3lame\bitstream.c" />
     <ClCompile Include="..\libmp3lame\encoder.c" />
@@ -132,9 +233,13 @@
     <ClCompile Include="..\libmp3lame\set_get.c" />
     <ClCompile Include="..\libmp3lame\tables.c">
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level1</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">Level1</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">Level1</WarningLevel>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</WarningLevel>
     </ClCompile>
     <ClCompile Include="..\libmp3lame\takehiro.c" />
     <ClCompile Include="..\libmp3lame\util.c" />
@@ -143,9 +248,13 @@
     <ClCompile Include="..\libmp3lame\version.c" />
     <ClCompile Include="..\libmp3lame\vector\xmm_quantize_sub.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../libmp3lame;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -152,21 +261,37 @@
     <ClInclude Include="..\libmp3lame\bitstream.h" />
     <CustomBuild Include="..\configMS.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Custom Build Step on %(Filename)</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Performing Custom Build Step on %(Filename)</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy ..\configMS.h ..\config.h
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy ..\configMS.h ..\config.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">Performing Custom Build Step on %(Filename)</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">Performing Custom Build Step on %(Filename)</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">copy ..\configMS.h ..\config.h
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">copy ..\configMS.h ..\config.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">Performing Custom Build Step on %(Filename)</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">Performing Custom Build Step on %(Filename)</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">copy ..\configMS.h ..\config.h
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">copy ..\configMS.h ..\config.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">..\config.h;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing Custom Build Step on %(Filename)</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Performing Custom Build Step on %(Filename)</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy ..\configMS.h ..\config.h
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy ..\configMS.h ..\config.h
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\config.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="..\libmp3lame\encoder.h" />
     <ClInclude Include="..\libmp3lame\fft.h" />
@@ -194,47 +319,75 @@
   <ItemGroup>
     <NASM Include="..\libmp3lame\i386\choose_table.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\cpu_feat.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fft.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fft3dn.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fftfpu.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fftsse.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\ffttbl.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\scalar.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </NASM>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Modified: trunk/lame/vc_solution/vs2019_libmp3lame_dll.vcxproj
===================================================================
--- trunk/lame/vc_solution/vs2019_libmp3lame_dll.vcxproj	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_libmp3lame_dll.vcxproj	2020-08-25 10:24:34 UTC (rev 6474)
@@ -5,18 +5,34 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseNASM|Win32">
       <Configuration>ReleaseNASM</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseNASM|x64">
+      <Configuration>ReleaseNASM</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseSSE2|Win32">
       <Configuration>ReleaseSSE2</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseSSE2|x64">
+      <Configuration>ReleaseSSE2</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>libmp3lame</ProjectName>
@@ -30,21 +46,41 @@
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="vs2019_nasm.props" />
@@ -55,6 +91,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_sse2.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_sse2.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -61,6 +103,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_x87.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_x87.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -67,6 +115,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_nasm.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_nasm.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="vs2019_libmpg123_config.props" />
@@ -73,6 +127,12 @@
     <Import Project="vs2019_lame_config.props" />
     <Import Project="vs2019_arch_x87.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2019_libmpg123_config.props" />
+    <Import Project="vs2019_lame_config.props" />
+    <Import Project="vs2019_arch_x87.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -92,6 +152,24 @@
       <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../libmp3lame;../;../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DLL=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -110,6 +188,24 @@
       <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../libmp3lame;../;../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DLL=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -125,6 +221,21 @@
       <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../libmp3lame;../;../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DLL=$(TargetFileName);_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -143,6 +254,24 @@
       <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../libmp3lame;../;../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DLL=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <ModuleDefinitionFile>..\include\lame.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ResourceCompile Include="..\libmp3lame\lame.rc" />
   </ItemGroup>

Modified: trunk/lame/vc_solution/vs2019_libmpg123_config.props
===================================================================
--- trunk/lame/vc_solution/vs2019_libmpg123_config.props	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_libmpg123_config.props	2020-08-25 10:24:34 UTC (rev 6474)
@@ -3,7 +3,7 @@
   <PropertyGroup Label="UserMacros">
     <!-- mpg123 configuration; set to true and adjust path, ending with a backslash -->
     <HaveMpg123>false</HaveMpg123>
-    <Mpg123Path>.\mpg123\</Mpg123Path>
+    <Mpg123Path>.\mpg123\$(Platform)\</Mpg123Path>
   </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="HaveMpg123">
@@ -24,7 +24,8 @@
     </Link>
     <PreLinkEvent>
       <!-- This step generates the import .lib file for libmpg123-0.dll, since the distribution only contains a .def file -->
-      <Command Condition="!Exists('$(Mpg123Path)libmpg123-0.lib')">lib.exe /def:"$(Mpg123Path)libmpg123-0.def" /out:"$(Mpg123Path)libmpg123-0.lib"</Command>
+      <Command Condition="!Exists('$(Mpg123Path)libmpg123-0.lib') And '$(Platform)' == 'Win32'">lib.exe /def:"$(Mpg123Path)libmpg123-0.def" /MACHINE:X86 /out:"$(Mpg123Path)libmpg123-0.lib"</Command>
+      <Command Condition="!Exists('$(Mpg123Path)libmpg123-0.lib') And '$(Platform)' == 'x64'">lib.exe /def:"$(Mpg123Path)libmpg123-0.def" /MACHINE:X64 /out:"$(Mpg123Path)libmpg123-0.lib"</Command>
     </PreLinkEvent>
     <PostBuildEvent>
       <Command Condition="'$(HaveMpg123)' == 'true'">copy "$(Mpg123Path)libmpg123-0.dll" "$(OutputPath)"</Command>

Modified: trunk/lame/vc_solution/vs2019_libsndfile_config.props
===================================================================
--- trunk/lame/vc_solution/vs2019_libsndfile_config.props	2020-08-25 10:18:20 UTC (rev 6473)
+++ trunk/lame/vc_solution/vs2019_libsndfile_config.props	2020-08-25 10:24:34 UTC (rev 6474)
@@ -3,7 +3,7 @@
   <PropertyGroup Label="UserMacros">
     <!-- libsndfile configuration; set to true and adjust path, ending with a backslash -->
     <HaveLibsndfile>false</HaveLibsndfile>
-    <LibsndfilePath>.\libsndfile\</LibsndfilePath>
+    <LibsndfilePath>.\libsndfile\$(Platform)\</LibsndfilePath>
   </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="HaveLibsndfile">

[Lame-cvs] SF.net SVN: lame:[6473] trunk/lame/include

[<ale...@us...>]

Revision: 6473
          http://sourceforge.net/p/lame/svn/6473
Author:   aleidinger
Date:     2020-08-25 10:18:20 +0000 (Tue, 25 Aug 2020)
Log Message:
-----------
Add hip_decode_init_gapless() to the linker exports.

Submitted by:	Michael Fink via [patches:#92]

Modified Paths:
--------------
    trunk/lame/include/lame.def
    trunk/lame/include/libmp3lame.sym

Modified: trunk/lame/include/lame.def
===================================================================
--- trunk/lame/include/lame.def	2020-08-25 10:14:14 UTC (rev 6472)
+++ trunk/lame/include/lame.def	2020-08-25 10:18:20 UTC (rev 6473)
@@ -271,6 +271,7 @@
 hip_set_debugf	@1107
 hip_set_errorf	@1108
 hip_set_msgf	@1109
+hip_decode_init_gapless	@1110
 
 id3tag_genre_list	@2000
 id3tag_init   		@2001

Modified: trunk/lame/include/libmp3lame.sym
===================================================================
--- trunk/lame/include/libmp3lame.sym	2020-08-25 10:14:14 UTC (rev 6472)
+++ trunk/lame/include/libmp3lame.sym	2020-08-25 10:18:20 UTC (rev 6473)
@@ -183,6 +183,7 @@
 lame_close
 lame_encode_finish
 hip_decode_init
+hip_decode_init_gapless
 hip_decode_exit
 hip_set_errorf
 hip_set_debugf

[Lame-cvs] SF.net SVN: lame:[6472] trunk/lame/frontend/get_audio.c

[<ale...@us...>]

Revision: 6472
          http://sourceforge.net/p/lame/svn/6472
Author:   aleidinger
Date:     2020-08-25 10:14:14 +0000 (Tue, 25 Aug 2020)
Log Message:
-----------
Fix the "Could not close audio input file" message when decoding from mp3
or transcoding. The message only occurred on Win32 builds of lame.exe.

Submitted by:	Michael Fink via [patches:#93]

Modified Paths:
--------------
    trunk/lame/frontend/get_audio.c

Modified: trunk/lame/frontend/get_audio.c
===================================================================
--- trunk/lame/frontend/get_audio.c	2020-08-19 14:06:06 UTC (rev 6471)
+++ trunk/lame/frontend/get_audio.c	2020-08-25 10:14:14 UTC (rev 6472)
@@ -2113,7 +2113,7 @@
 
 static void lame123_cleanup_file(void* handle)
 {
-   fclose((FILE*)handle);
+   /* don't call fclose(); close_input_file() will do that */
 }
 #endif
 

[Lame-cvs] SF.net SVN: lame:[6471] trunk/lame

[<ale...@us...>]

Revision: 6471
          http://sourceforge.net/p/lame/svn/6471
Author:   aleidinger
Date:     2020-08-19 14:06:06 +0000 (Wed, 19 Aug 2020)
Log Message:
-----------
Fix the homepage of LAME. The old www.mp3dev.org is pointing to the
sourceforge page.

Modified Paths:
--------------
    trunk/lame/ACM/acm.rc
    trunk/lame/Dll/BladeMP3EncDLL.c
    trunk/lame/LICENSE
    trunk/lame/Makefile.MSVC
    trunk/lame/debian/copyright
    trunk/lame/doc/man/lame.1
    trunk/lame/dshow/Property.rc
    trunk/lame/libmp3lame/id3tag.c
    trunk/lame/misc/abx.c

Modified: trunk/lame/ACM/acm.rc
===================================================================
--- trunk/lame/ACM/acm.rc	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/ACM/acm.rc	2020-08-19 14:06:06 UTC (rev 6471)
@@ -71,7 +71,7 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "This is an ACM driver for Win32 using Lame to encode\0"
-            VALUE "CompanyName", "http://www.mp3dev.org/\0"
+            VALUE "CompanyName", "https://lame.sourceforge.io/\0"
             VALUE "FileDescription", "Lame MP3 codec engine\0"
             VALUE "FileVersion", "0.9.2\0"
             VALUE "InternalName", "lameACM\0"
@@ -171,7 +171,7 @@
     LTEXT           "LGPL license",IDC_STATIC,7,20,43,8
     ICON            IDI_ICON,IDC_STATIC,145,16,20,20
     LTEXT           "Static",IDC_STATIC_ABOUT_TITLE,7,7,173,8
-    LTEXT           "http://www.mp3dev.org/",IDC_STATIC_ABOUT_URL,7,47,80,8
+    LTEXT           "https://lame.sourceforge.io/",IDC_STATIC_ABOUT_URL,7,47,80,8
     LTEXT           "icon : Lucas Granito",IDC_STATIC,7,61,64,8
 END
 

Modified: trunk/lame/Dll/BladeMP3EncDLL.c
===================================================================
--- trunk/lame/Dll/BladeMP3EncDLL.c	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/Dll/BladeMP3EncDLL.c	2020-08-19 14:06:06 UTC (rev 6471)
@@ -678,7 +678,7 @@
 
     memset( pbeVersion->zHomepage, 0x00, BE_MAX_HOMEPAGE );
 
-    strcpy( pbeVersion->zHomepage, "http://www.mp3dev.org/" );
+    strcpy( pbeVersion->zHomepage, "https://lame.sourceforge.io/" );
 }
 
 __declspec(dllexport) BE_ERR	beEncodeChunk(HBE_STREAM hbeStream, DWORD nSamples, 

Modified: trunk/lame/LICENSE
===================================================================
--- trunk/lame/LICENSE	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/LICENSE	2020-08-19 14:06:06 UTC (rev 6471)
@@ -7,7 +7,7 @@
    lame_enc.dll or libmp3lame.dll on windows)
 
 2. Fully acknowledge that you are using LAME, and give a link
-   to our web site, www.mp3dev.org
+   to our web site, https://lame.sourceforge.io/:w
 
 3. If you make modifications to LAME, you *must* release these
    modifications back to the LAME project, under the LGPL.

Modified: trunk/lame/Makefile.MSVC
===================================================================
--- trunk/lame/Makefile.MSVC	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/Makefile.MSVC	2020-08-19 14:06:06 UTC (rev 6471)
@@ -1,7 +1,7 @@
 #	Makefile.MSVC: MSVC Makefile for LAME
 #
 #	2000-2010 Robert Hegemann
-#	dedicated to the LAME project http://www.mp3dev.org
+#	dedicated to the LAME project https://lame.sourceforge.io/
 ###############################################################################
 
 

Modified: trunk/lame/debian/copyright
===================================================================
--- trunk/lame/debian/copyright	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/debian/copyright	2020-08-19 14:06:06 UTC (rev 6471)
@@ -36,7 +36,7 @@
    lame_enc.dll on windows)
 
 2. Fully acknowledge that you are using LAME, and give a link
-   to our web site, www.mp3dev.org
+   to our web site, https://lame.sourceforge.io/
 
 3. If you make modifications to LAME, you *must* release these
    these modifications back to the LAME project, under the LGPL.

Modified: trunk/lame/doc/man/lame.1
===================================================================
--- trunk/lame/doc/man/lame.1	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/doc/man/lame.1	2020-08-19 14:06:06 UTC (rev 6471)
@@ -1090,7 +1090,7 @@
 Mark Taylor, and the LAME team.
 
 GPSYCHO psycho-acoustic model by Mark Taylor.
-(See http://www.mp3dev.org/).
+(See https://lame.sourceforge.io/).
 
 mpglib by Michael Hipp
 

Modified: trunk/lame/dshow/Property.rc
===================================================================
--- trunk/lame/dshow/Property.rc	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/dshow/Property.rc	2020-08-19 14:06:06 UTC (rev 6471)
@@ -157,7 +157,7 @@
 BEGIN
     LTEXT           "LAME Ain't MP3 Encoder (X.XX engine)",IDC_LAME_VER,7,8,
                     208,8
-    LTEXT           "LAME Project Homepage: http://www.mp3dev.org",
+    LTEXT           "LAME Project Homepage: https://lame.sourceforge.io/",
                     IDC_LAME_URL,7,19,192,8
     EDITTEXT        IDC_LAME_LA,7,31,214,83,ES_MULTILINE | ES_AUTOVSCROLL | 
                     ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL

Modified: trunk/lame/libmp3lame/id3tag.c
===================================================================
--- trunk/lame/libmp3lame/id3tag.c	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/libmp3lame/id3tag.c	2020-08-19 14:06:06 UTC (rev 6471)
@@ -20,7 +20,7 @@
  */
 
 /*
- * HISTORY: This source file is part of LAME (see http://www.mp3dev.org)
+ * HISTORY: This source file is part of LAME (see https://lame.sourceforge.io/)
  * and was originally adapted by Conrad Sanderson <c.s...@me...>
  * from mp3info by Ricardo Cerqueira <rm...@rc...> to write only ID3 version 1
  * tags.  Don Melton <do...@bl...> COMPLETELY rewrote it to support version

Modified: trunk/lame/misc/abx.c
===================================================================
--- trunk/lame/misc/abx.c	2020-08-19 13:13:26 UTC (rev 6470)
+++ trunk/lame/misc/abx.c	2020-08-19 14:06:06 UTC (rev 6471)
@@ -906,9 +906,9 @@
 const decoder_t  decoder [] = {
     { ".mp1"    , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer I         : www.iis.fhg.de, www.mpeg.org
     { ".mp2"    , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer II        : www.iis.fhg.de, www.uq.net.au/~zzmcheng, www.mpeg.org
-    { ".mp3"    , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer III       : www.iis.fhg.de, www.mp3dev.org, www.mpeg.org
-    { ".mp3pro" , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer III       : www.iis.fhg.de, www.mp3dev.org, www.mpeg.org
-    { ".mpt"    , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer III       : www.iis.fhg.de, www.mp3dev.org, www.mpeg.org
+    { ".mp3"    , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer III       : www.iis.fhg.de, lame.sourceforge.io, www.mpeg.org
+    { ".mp3pro" , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer III       : www.iis.fhg.de, lame.sourceforge.io, www.mpeg.org
+    { ".mpt"    , PATH"mpg123 -w - %s"                         REDIR },  // MPEG Layer III       : www.iis.fhg.de, lame.sourceforge.io, www.mpeg.org
     { ".mpp"    , PATH"mppdec %s -"                            REDIR },  // MPEGplus             : www.stud.uni-hannover.de/user/73884
     { ".mpc"    , PATH"mppdec %s -"                            REDIR },  // MPEGplus             : www.stud.uni-hannover.de/user/73884
     { ".mp+"    , PATH"mppdec %s -"                            REDIR },  // MPEGplus             : www.stud.uni-hannover.de/user/73884

[Lame-cvs] SF.net SVN: lame:[6470] trunk/lame/libmp3lame/i386/nasm.h

[<ale...@us...>]

Revision: 6470
          http://sourceforge.net/p/lame/svn/6470
Author:   aleidinger
Date:     2020-08-19 13:13:26 +0000 (Wed, 19 Aug 2020)
Log Message:
-----------
Fix nasm include file (UTF-8 BOM which nasm does't know about).

Submitted by:	KO Myung-Hun via [patches:#81]

Modified Paths:
--------------
    trunk/lame/libmp3lame/i386/nasm.h

Modified: trunk/lame/libmp3lame/i386/nasm.h
===================================================================
--- trunk/lame/libmp3lame/i386/nasm.h	2020-08-19 12:56:39 UTC (rev 6469)
+++ trunk/lame/libmp3lame/i386/nasm.h	2020-08-19 13:13:26 UTC (rev 6470)
@@ -1,4 +1,4 @@
-
+;
 ;	Copyright (C) 1999 URURI
 
 ;	nasm�ѥޥ���

[Lame-cvs] SF.net SVN: lame:[6469] trunk/lame/vc_solution

[<ale...@us...>]

Revision: 6469
          http://sourceforge.net/p/lame/svn/6469
Author:   aleidinger
Date:     2020-08-19 12:56:39 +0000 (Wed, 19 Aug 2020)
Log Message:
-----------
- add files to build LAME with Visual Studio 2019
- remove the old project files for VC 9
- add a readme with a description about what you can do with the files

Submitted by:	Michael Fink via [patches:#91]

Modified Paths:
--------------
    trunk/lame/vc_solution/Makefile.am
    trunk/lame/vc_solution/Makefile.in

Added Paths:
-----------
    trunk/lame/vc_solution/README.vs2019.txt
    trunk/lame/vc_solution/vs2019_arch_nasm.props
    trunk/lame/vc_solution/vs2019_arch_sse2.props
    trunk/lame/vc_solution/vs2019_arch_x87.props
    trunk/lame/vc_solution/vs2019_gtk_config.props
    trunk/lame/vc_solution/vs2019_lame.sln
    trunk/lame/vc_solution/vs2019_lame_acm.vcxproj
    trunk/lame/vc_solution/vs2019_lame_acm.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_acm_adbg.vcxproj
    trunk/lame/vc_solution/vs2019_lame_acm_adbg.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_acm_tinyxml.vcxproj
    trunk/lame/vc_solution/vs2019_lame_clients.sln
    trunk/lame/vc_solution/vs2019_lame_config.props
    trunk/lame/vc_solution/vs2019_lame_dshow.vcxproj
    trunk/lame/vc_solution/vs2019_lame_dshow.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_enc_dll.vcxproj
    trunk/lame/vc_solution/vs2019_lame_enc_dll.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_lame.vcxproj
    trunk/lame/vc_solution/vs2019_lame_lame.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_mp3rtp.vcxproj
    trunk/lame/vc_solution/vs2019_lame_mp3rtp.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_mp3x.vcxproj
    trunk/lame/vc_solution/vs2019_lame_mp3x.vcxproj.filters
    trunk/lame/vc_solution/vs2019_lame_test.vcxproj
    trunk/lame/vc_solution/vs2019_libmp3lame.vcxproj
    trunk/lame/vc_solution/vs2019_libmp3lame.vcxproj.filters
    trunk/lame/vc_solution/vs2019_libmp3lame_dll.vcxproj
    trunk/lame/vc_solution/vs2019_libmpg123_config.props
    trunk/lame/vc_solution/vs2019_libsndfile_config.props
    trunk/lame/vc_solution/vs2019_nasm.props
    trunk/lame/vc_solution/vs2019_nasm.targets
    trunk/lame/vc_solution/vs2019_nasm.xml
    trunk/lame/vc_solution/vs2019_win71sdk_config.props

Removed Paths:
-------------
    trunk/lame/vc_solution/arch_nasm.vsprops
    trunk/lame/vc_solution/arch_sse2.vsprops
    trunk/lame/vc_solution/arch_x87.vsprops
    trunk/lame/vc_solution/vc9_lame.sln
    trunk/lame/vc_solution/vc9_lame_acm.vcproj
    trunk/lame/vc_solution/vc9_lame_acm_adbg.vcproj
    trunk/lame/vc_solution/vc9_lame_acm_tinyxml.vcproj
    trunk/lame/vc_solution/vc9_lame_clients.sln
    trunk/lame/vc_solution/vc9_lame_config.vsprops
    trunk/lame/vc_solution/vc9_lame_dll.vcproj
    trunk/lame/vc_solution/vc9_lame_dll_example.vcproj
    trunk/lame/vc_solution/vc9_lame_dshow.vcproj
    trunk/lame/vc_solution/vc9_lame_lame.vcproj
    trunk/lame/vc_solution/vc9_lame_mp3rtp.vcproj
    trunk/lame/vc_solution/vc9_lame_mp3x.vcproj
    trunk/lame/vc_solution/vc9_lame_test.vcproj
    trunk/lame/vc_solution/vc9_libmp3lame.vcproj
    trunk/lame/vc_solution/vc9_libmp3lame_dll.vcproj
    trunk/lame/vc_solution/vc9_mpglib.vcproj
    trunk/lame/vc_solution/vc9_nasm.rules

Modified: trunk/lame/vc_solution/Makefile.am
===================================================================
--- trunk/lame/vc_solution/Makefile.am	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/Makefile.am	2020-08-19 12:56:39 UTC (rev 6469)
@@ -3,24 +3,36 @@
 include $(top_srcdir)/Makefile.am.global
 
 EXTRA_DIST = \
-	arch_nasm.vsprops \
-	arch_sse2.vsprops \
-	arch_x87.vsprops \
-	vc9_lame_acm_adbg.vcproj \
-	vc9_lame_acm_tinyxml.vcproj \
-	vc9_lame_acm.vcproj \
-	vc9_lame_clients.sln \
-	vc9_lame_config.vsprops \
-	vc9_lame_dll_example.vcproj \
-	vc9_lame_dll.vcproj \
-	vc9_lame_dshow.vcproj \
-	vc9_lame_lame.vcproj \
-	vc9_lame_mp3rtp.vcproj \
-	vc9_lame_mp3x.vcproj \
-	vc9_lame_test.vcproj \
-	vc9_lame.sln \
-	vc9_libmp3lame_dll.vcproj \
-	vc9_libmp3lame.vcproj \
-	vc9_mpglib.vcproj \
-	vc9_nasm.rules
-
+	README.vs2019.txt \
+	vs2019_arch_nasm.props \
+	vs2019_arch_sse2.props \
+	vs2019_arch_x87.props \
+	vs2019_gtk_config.props \
+	vs2019_lame_acm_adbg.vcxproj \
+	vs2019_lame_acm_adbg.vcxproj.filters \
+	vs2019_lame_acm_tinyxml.vcxproj \
+	vs2019_lame_acm.vcxproj \
+	vs2019_lame_acm.vcxproj.filters \
+	vs2019_lame_clients.sln \
+	vs2019_lame_config.props \
+	vs2019_lame_dshow.vcxproj \
+	vs2019_lame_dshow.vcxproj.filters \
+	vs2019_lame_enc_dll.vcxproj \
+	vs2019_lame_enc_dll.vcxproj.filters \
+	vs2019_lame_lame.vcxproj \
+	vs2019_lame_lame.vcxproj.filters \
+	vs2019_lame_mp3rtp.vcxproj \
+	vs2019_lame_mp3rtp.vcxproj.filters \
+	vs2019_lame_mp3x.vcxproj \
+	vs2019_lame_mp3x.vcxproj.filters \
+	vs2019_lame_test.vcxproj \
+	vs2019_lame.sln \
+	vs2019_libmp3lame_dll.vcxproj \
+	vs2019_libmp3lame.vcxproj \
+	vs2019_libmp3lame.vcxproj.filters \
+	vs2019_libmpg123_config.props \
+	vs2019_libsndfile_config.props \
+	vs2019_nasm.props \
+	vs2019_nasm.targets \
+	vs2019_nasm.xml \
+	vs2019_win71sdk_config.props

Modified: trunk/lame/vc_solution/Makefile.in
===================================================================
--- trunk/lame/vc_solution/Makefile.in	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/Makefile.in	2020-08-19 12:56:39 UTC (rev 6469)
@@ -274,26 +274,39 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.15 foreign
 EXTRA_DIST = \
-	arch_nasm.vsprops \
-	arch_sse2.vsprops \
-	arch_x87.vsprops \
-	vc9_lame_acm_adbg.vcproj \
-	vc9_lame_acm_tinyxml.vcproj \
-	vc9_lame_acm.vcproj \
-	vc9_lame_clients.sln \
-	vc9_lame_config.vsprops \
-	vc9_lame_dll_example.vcproj \
-	vc9_lame_dll.vcproj \
-	vc9_lame_dshow.vcproj \
-	vc9_lame_lame.vcproj \
-	vc9_lame_mp3rtp.vcproj \
-	vc9_lame_mp3x.vcproj \
-	vc9_lame_test.vcproj \
-	vc9_lame.sln \
-	vc9_libmp3lame_dll.vcproj \
-	vc9_libmp3lame.vcproj \
-	vc9_mpglib.vcproj \
-	vc9_nasm.rules
+	README.vs2019.txt \
+	vs2019_arch_nasm.props \
+	vs2019_arch_sse2.props \
+	vs2019_arch_x87.props \
+	vs2019_gtk_config.props \
+	vs2019_lame_acm_adbg.vcxproj \
+	vs2019_lame_acm_adbg.vcxproj.filters \
+	vs2019_lame_acm_tinyxml.vcxproj \
+	vs2019_lame_acm.vcxproj \
+	vs2019_lame_acm.vcxproj.filters \
+	vs2019_lame_clients.sln \
+	vs2019_lame_config.props \
+	vs2019_lame_dshow.vcxproj \
+	vs2019_lame_dshow.vcxproj.filters \
+	vs2019_lame_enc_dll.vcxproj \
+	vs2019_lame_enc_dll.vcxproj.filters \
+	vs2019_lame_lame.vcxproj \
+	vs2019_lame_lame.vcxproj.filters \
+	vs2019_lame_mp3rtp.vcxproj \
+	vs2019_lame_mp3rtp.vcxproj.filters \
+	vs2019_lame_mp3x.vcxproj \
+	vs2019_lame_mp3x.vcxproj.filters \
+	vs2019_lame_test.vcxproj \
+	vs2019_lame.sln \
+	vs2019_libmp3lame_dll.vcxproj \
+	vs2019_libmp3lame.vcxproj \
+	vs2019_libmp3lame.vcxproj.filters \
+	vs2019_libmpg123_config.props \
+	vs2019_libsndfile_config.props \
+	vs2019_nasm.props \
+	vs2019_nasm.targets \
+	vs2019_nasm.xml \
+	vs2019_win71sdk_config.props
 
 all: all-am
 

Added: trunk/lame/vc_solution/README.vs2019.txt
===================================================================
--- trunk/lame/vc_solution/README.vs2019.txt	                        (rev 0)
+++ trunk/lame/vc_solution/README.vs2019.txt	2020-08-19 12:56:39 UTC (rev 6469)
@@ -0,0 +1,130 @@
+# README for compiling LAME with Visual Studio 2019
+
+This document describes how to compile the LAME projects using Visual Studio
+2019. Any edition will do, even the free Community edition. Be sure to install
+the "Desktop development with C++" workload.
+
+## Projects
+
+There are two solution files in the "lame/vc_solution" folder that can be
+opened. The solution "vs2019_lame.sln" contains the following projects:
+
+- lame: The lame.exe command line executable
+- libmp3lame: The dynamic library libmp3lame.dll
+- libmp3lame-static: The static library variant of the above
+- mp3rtp: command line tool to stream mp3 via RTP protocol
+- mp3x: mp3 frame analyzer tool using GTK1 (see below)
+
+The solution "vs2019_lame_clients.sln" contains several more projects:
+
+- ACM, ADbg, tinyxml: Ancient Windows "Audio Codec Manager"
+- lame_DirectShow: DirectShow filter
+- lame_test: Test program
+
+In the two solutions there are several configurations that can be used to
+compile different flavors of LAME libraries and executables:
+
+- Debug: Builds without optimization, but debugging support
+- Release: Optimization build, without SSE2 or NASM assembly
+- ReleaseNASM: Uses NASM (see below) to compile some routines using NASM
+- ReleaseSSE2: Uses SSE2 assembler instructions to optimize routines
+
+## External libraries and tools
+
+For some projects, external libraries or tools are necessary for successful
+compilation. These can be configured using .props files or the Property Manager
+window of Visual Studio (View > Other Windows > Property Manager). The props
+files have a "User Macros" page where the variable values can be changed.
+
+### NASM
+
+The Netwide Assembler is used to compile assembly routines contained in the
+.nas files. The most recent version of NASM can be downloaded here:
+https://nasm.us/
+
+Extract the zip archive in any folder. Open the file
+"lame/vc_solution/vs2019_arch_nasm.props" and edit the `NasmPath` in the first
+few lines of the file, ending the path with a backslash. As described above,
+you can also use the Property Manager view to change the values.
+
+Note that NASM is only used when selecting the "ReleaseNASM" configuration.
+
+### libsndfile
+
+LAME can be compiled with the libsndfile library for audio input. Libsndfile
+can be downloaded here:
+http://mega-nerd.com/libsndfile/#Download
+
+Install the Win32 installer into any folder, or (if available) extract
+pre-release versions (e.g. libsndfile-1.0.29pre1-w32.zip) into any folder.
+
+Open the file "lame/vc_solution/vs2019_lame_config.props" and edit the
+following  two user macro parameters:
+
+- The value of `HaveLibsndfile` can be set to false or true, and specifies if
+  the libsndfile library is available and used in lame.exe
+- `LibsndfilePath` specifies the path to the root folder of libsndfile, ending
+  the path with a backslash. The folder should contain the `include`, `lib`
+  and `bin` folders.
+
+As described above, you can also use the Property Manager view to change the
+values.
+
+### mpg123
+
+From LAME version 3.100.1 on, LAME supports decoding using the external mpg123
+library, which is a mature fork of the internally used mpglib library. The
+latest binaries for Win32 are available here:
+https://mpg123.de/
+
+Open the file "lame/vc_solution/vs2019_libmpg123_config.props" and edit the
+following  two user macro parameters:
+
+- The value of `HaveMpg123` can be set to false or true, and specifies if
+  the libmpg123 library is available and used in lame.exe and libmp3lame.dll.
+  When set to false, decoding is not available in LAME. This includes
+  calculating accurate Replaygain by decoding the just encoded data on-the-fly.
+- `Mpg123Path` specifies the path to the root folder of mpg123, ending
+  the path with a backslash. The folder should contain the `mpg123.h` and
+  `libmpg123-0.dll` files, among others.
+
+As described above, you can also use the Property Manager view to change the
+values.
+
+### GTK1
+
+The mp3x graphical frame analyzer uses GTK1 for the user interface. One of the
+few still available ports to Windows is "GTK1 for Windows", which can be used
+to compile mp3x. You can download version 1.4 here:
+https://sourceforge.net/projects/gtk1-win/
+
+Extract the zip archive in any folder. Open the file
+"lame/vc_solution/vs2019_gtk_config.props" and edit the `WinGtkPath` in the
+first few lines of the file, ending the path with a backslash.
+
+As described above, you can also use the Property Manager view to change the
+values.
+
+### Windows SDK 7.1
+
+For the DirectShow filter, the Windows SDK 7.1 is needed, especially the
+samples folder where a multimedia base class library must be compiled before.
+
+Download the Windows SDK 7.1 installer from here:
+https://www.microsoft.com/en-us/download/details.aspx?id=8279
+(or search for "Microsoft Windows SDK for Windows 7 and .NET Framework 4",
+version 7.1)
+
+When starting the web setup, you can choose the installation options. Only the
+"Samples" under "Windows Native Code Development" is actually necessary.
+
+Open the file "lame/vc_solution/vs2019_win71sdk_config.props" and edit the
+`Win71SdkPath` in the first few lines of the file, ending the path with a
+backslash. As described above, you can also use the Property Manager view to
+change the values.
+
+In the Win71SdkPath path, locate the solution file
+"Samples\multimedia\directshow\baseclasses\baseclasses.sln", convert it from
+the old Visual Studio project format and compile the "Debug_MBCS" and
+"Release_MBCS" configurations. The resulting files strmbasd.lib and
+strmbase.lib are used by the lame_DirectShow project for linking.


Property changes on: trunk/lame/vc_solution/README.vs2019.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/lame/vc_solution/arch_nasm.vsprops
===================================================================
--- trunk/lame/vc_solution/arch_nasm.vsprops	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/arch_nasm.vsprops	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="arch_nasm"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="TAKEHIRO_IEEE754_HACK;HAVE_NASM;MMX_choose_table"
-	/>
-</VisualStudioPropertySheet>

Deleted: trunk/lame/vc_solution/arch_sse2.vsprops
===================================================================
--- trunk/lame/vc_solution/arch_sse2.vsprops	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/arch_sse2.vsprops	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="arch_sse2"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="HAVE_XMMINTRIN_H;MIN_ARCH_SSE"
-		EnableEnhancedInstructionSet="2"
-		FloatingPointModel="2"
-	/>
-</VisualStudioPropertySheet>

Deleted: trunk/lame/vc_solution/arch_x87.vsprops
===================================================================
--- trunk/lame/vc_solution/arch_x87.vsprops	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/arch_x87.vsprops	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="arch_x87"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="TAKEHIRO_IEEE754_HACK"
-	/>
-</VisualStudioPropertySheet>

Deleted: trunk/lame/vc_solution/vc9_lame.sln
===================================================================
--- trunk/lame/vc_solution/vc9_lame.sln	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame.sln	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,91 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app lame", "vc9_lame_lame.vcproj", "{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}"
-	ProjectSection(ProjectDependencies) = postProject
-		{20536101-3B0E-43EF-94F9-080D595DAC57} = {20536101-3B0E-43EF-94F9-080D595DAC57}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib encoder LAME", "vc9_libmp3lame.vcproj", "{20536101-3B0E-43EF-94F9-080D595DAC57}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8} = {E2DAB91A-8248-4625-8A85-2C2C2A390DD8}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dll lame", "vc9_libmp3lame_dll.vcproj", "{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{20536101-3B0E-43EF-94F9-080D595DAC57} = {20536101-3B0E-43EF-94F9-080D595DAC57}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib decoder HIP", "vc9_mpglib.vcproj", "{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app mp3rtp", "vc9_lame_mp3rtp.vcproj", "{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{20536101-3B0E-43EF-94F9-080D595DAC57} = {20536101-3B0E-43EF-94F9-080D595DAC57}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app mp3x", "vc9_lame_mp3x.vcproj", "{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{20536101-3B0E-43EF-94F9-080D595DAC57} = {20536101-3B0E-43EF-94F9-080D595DAC57}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		ReleaseNASM|Win32 = ReleaseNASM|Win32
-		ReleaseSSE2|Win32 = ReleaseSSE2|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Debug|Win32.Build.0 = Debug|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|Win32.ActiveCfg = Release|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.Release|Win32.Build.0 = Release|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{EEF5B49E-DBD1-4E1B-8B86-C5D64FCBAD38}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.ActiveCfg = Debug|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.Build.0 = Debug|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.ActiveCfg = Release|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.Build.0 = Release|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.Build.0 = Debug|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.ActiveCfg = Release|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.Build.0 = Release|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.Build.0 = Release|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Debug|Win32.Build.0 = Debug|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Release|Win32.ActiveCfg = Release|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.Release|Win32.Build.0 = Release|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{C04BA4EA-F719-456D-A332-6C3AF92D7BEA}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Debug|Win32.Build.0 = Debug|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Release|Win32.ActiveCfg = Release|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.Release|Win32.Build.0 = Release|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{E745EB1A-070A-45ED-B8BD-D9F794E23CFA}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/lame/vc_solution/vc9_lame_acm.vcproj
===================================================================
--- trunk/lame/vc_solution/vc9_lame_acm.vcproj	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_acm.vcproj	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,433 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ACM"
-	ProjectGUID="{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\output\Release/lameACM.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../include,../mpglib,../ACM,../ACM/ddk"
-				PreprocessorDefinitions="NDEBUG;_BLADEDLL;_WINDOWS;WIN32;LAME_ACM"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				StructMemberAlignment="2"
-				TreatWChar_tAsBuiltInType="false"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="libmp3lame.lib url.lib winmm.lib"
-				OutputFile="..\output\Release\lameACM.acm"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile="..\ACM\lameACM.def"
-				SubSystem="2"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="ACM config files"
-				CommandLine="copy ..\ACM\lameacm.inf $(TargetDir)*.*&#x0D;&#x0A;copy ..\ACM\lame_acm.xml $(TargetDir)*.*&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\output\Debug\lameACM.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include,../mpglib,../ACM,../ACM/ddk"
-				PreprocessorDefinitions="_DEBUG;_BLADEDLL;_WINDOWS;WIN32;LAME_ACM"
-				StringPooling="true"
-				RuntimeLibrary="3"
-				StructMemberAlignment="2"
-				TreatWChar_tAsBuiltInType="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="libmp3lame.lib url.lib winmm.lib"
-				OutputFile="..\output\Debug\lameACM.acm"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile="..\ACM\lameACM.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(IntDir)/$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="ACM config files"
-				CommandLine="copy ..\ACM\lameacm.inf $(TargetDir)*.*&#x0D;&#x0A;copy ..\ACM\lame_acm.xml $(TargetDir)*.*&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source"
-			Filter="c;cpp"
-			>
-			<File
-				RelativePath="..\ACM\ACM.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ACM\ACMStream.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ACM\AEncodeProperties.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ACM\DecodeStream.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ACM\lameACM.def"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ACM\main.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Include"
-			Filter="h"
-			>
-			<File
-				RelativePath="..\ACM\ACM.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ACM\ACMStream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ACM\adebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ACM\AEncodeProperties.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ACM\DecodeStream.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource"
-			Filter="rc"
-			>
-			<File
-				RelativePath="..\ACM\acm.rc"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ACM\lame.ico"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Install"
-			Filter="inf;acm"
-			>
-			<File
-				RelativePath="..\ACM\LameACM.inf"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\ACM\readme.txt"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\ACM\TODO"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/lame/vc_solution/vc9_lame_acm_adbg.vcproj
===================================================================
--- trunk/lame/vc_solution/vc9_lame_acm_adbg.vcproj	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_acm_adbg.vcproj	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ACM ADbg"
-	ProjectGUID="{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(IntDir)\$(ProjectName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(IntDir)\$(ProjectName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp"
-			>
-			<File
-				RelativePath="..\ACM\ADbg\ADbg.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h"
-			>
-			<File
-				RelativePath="..\ACM\ADbg\ADbg.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/lame/vc_solution/vc9_lame_acm_tinyxml.vcproj
===================================================================
--- trunk/lame/vc_solution/vc9_lame_acm_tinyxml.vcproj	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_acm_tinyxml.vcproj	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ACM tinyxml"
-	ProjectGUID="{30219289-3B7F-4E02-BC34-C1DBD08CD848}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(IntDir)\$(ProjectName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(IntDir)\$(ProjectName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\ACM\tinyxml\changes.txt"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\ACM\tinyxml\readme.txt"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\ACM\tinyxml\tinyxml.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\ACM\tinyxml\tinyxml.h"
-			>
-		</File>
-		<File
-			RelativePath="..\ACM\tinyxml\tinyxmlerror.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\ACM\tinyxml\tinyxmlparser.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/lame/vc_solution/vc9_lame_clients.sln
===================================================================
--- trunk/lame/vc_solution/vc9_lame_clients.sln	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_clients.sln	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,103 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACM ADbg", "vc9_lame_acm_adbg.vcproj", "{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACM tinyxml", "vc9_lame_acm_tinyxml.vcproj", "{30219289-3B7F-4E02-BC34-C1DBD08CD848}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACM", "vc9_lame_acm.vcproj", "{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA} = {0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848} = {30219289-3B7F-4E02-BC34-C1DBD08CD848}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DShow", "vc9_lame_dshow.vcproj", "{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lame_enc_dll", "vc9_lame_dll.vcproj", "{0E4820D3-DBE3-477A-910B-7C020D6066D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lame_enc_dll_example", "vc9_lame_dll_example.vcproj", "{D169F06E-6607-4A9F-A075-2335717B9AB5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lame_test", "vc9_lame_test.vcproj", "{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2} = {92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp3lameDLL", "vc9_libmp3lame_dll.vcproj", "{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		ReleaseNASM|Win32 = ReleaseNASM|Win32
-		ReleaseSSE2|Win32 = ReleaseSSE2|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.Debug|Win32.Build.0 = Debug|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.Release|Win32.ActiveCfg = Release|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.Release|Win32.Build.0 = Release|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{0D7CAB1B-AE57-4BA1-BDBF-D7391AAA81AA}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.Debug|Win32.ActiveCfg = Debug|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.Debug|Win32.Build.0 = Debug|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.Release|Win32.ActiveCfg = Release|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.Release|Win32.Build.0 = Release|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{30219289-3B7F-4E02-BC34-C1DBD08CD848}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.Debug|Win32.Build.0 = Debug|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.Release|Win32.ActiveCfg = Release|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.Release|Win32.Build.0 = Release|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{FC3D65E7-B7CB-406E-B6C9-0B26E30FE7F4}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.Debug|Win32.Build.0 = Debug|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.Release|Win32.ActiveCfg = Release|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.Release|Win32.Build.0 = Release|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.Debug|Win32.Build.0 = Debug|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.Release|Win32.ActiveCfg = Release|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.Release|Win32.Build.0 = Release|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{0E4820D3-DBE3-477A-910B-7C020D6066D1}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.Debug|Win32.Build.0 = Debug|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.Release|Win32.ActiveCfg = Release|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.Release|Win32.Build.0 = Release|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{D169F06E-6607-4A9F-A075-2335717B9AB5}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.Debug|Win32.Build.0 = Debug|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.Release|Win32.ActiveCfg = Release|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.Release|Win32.Build.0 = Release|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{2FE9808B-2B03-48D9-94FC-6C907D39E2AC}.ReleaseSSE2|Win32.Build.0 = Release|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Debug|Win32.Build.0 = Debug|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.ActiveCfg = Release|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.Release|Win32.Build.0 = Release|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{92BD50AA-04D6-4FBF-ACE1-468FAF6778F2}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/lame/vc_solution/vc9_lame_config.vsprops
===================================================================
--- trunk/lame/vc_solution/vc9_lame_config.vsprops	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_config.vsprops	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="vc9_lame_config"
-	OutputDirectory="$(SolutionDir)..\output\$(ConfigurationName)"
-	IntermediateDirectory="$(SolutionDir)..\obj\$(ConfigurationName)\$(ProjectName)"
-	>
-	<Tool
-		Name="VCBscMakeTool"
-		OutputFile="$(IntDir)/$(ProjectName).bsc"
-	/>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATED"
-		StringPooling="true"
-		EnableFunctionLevelLinking="true"
-		AssemblerListingLocation="$(IntDir)\"
-		BrowseInformation="1"
-		WarningLevel="4"
-		DisableSpecificWarnings="4995;4996"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="1"
-		AdditionalLibraryDirectories="$(OutDir)"
-		ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-		OptimizeReferences="2"
-	/>
-</VisualStudioPropertySheet>

Deleted: trunk/lame/vc_solution/vc9_lame_dll.vcproj
===================================================================
--- trunk/lame/vc_solution/vc9_lame_dll.vcproj	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_dll.vcproj	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="lame_enc_dll"
-	ProjectGUID="{0E4820D3-DBE3-477A-910B-7C020D6066D1}"
-	RootNamespace="lame_enc_dll"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\output\Debug/LameDll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LAMEMP3ENCDLL_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmp3lame.lib odbc32.lib odbccp32.lib"
-				OutputFile="..\output\Debug\lame_enc.dll"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ImportLibrary="$(OutDir)/lame_enc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\output\Release/LameDll.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LAMEMP3ENCDLL_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libmp3lame.lib"
-				OutputFile="..\output\Release\lame_enc.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				ImportLibrary="$(OutDir)/lame_enc.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\Dll\BladeMP3EncDLL.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Dll\BladeMP3EncDLL.def"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\Dll\BladeMP3EncDLL.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/lame/vc_solution/vc9_lame_dll_example.vcproj
===================================================================
--- trunk/lame/vc_solution/vc9_lame_dll_example.vcproj	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_dll_example.vcproj	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="lame_enc_dll_example"
-	ProjectGUID="{D169F06E-6607-4A9F-A075-2335717B9AB5}"
-	RootNamespace="lame_enc_dll_example"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName="..\obj\Release\LameMp3EncDll/Example.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName="..\obj\Debug\LameMp3EncDll/Example.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\Dll\Example.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Deleted: trunk/lame/vc_solution/vc9_lame_dshow.vcproj
===================================================================
--- trunk/lame/vc_solution/vc9_lame_dshow.vcproj	2020-08-19 12:45:47 UTC (rev 6468)
+++ trunk/lame/vc_solution/vc9_lame_dshow.vcproj	2020-08-19 12:56:39 UTC (rev 6469)
@@ -1,487 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="DShow"
-	ProjectGUID="{6D348A4E-8B40-4FB0-BB57-C982D51FFA01}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\vc9_lame_config.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="..\obj\Debug/dshow.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include,..\DShow"
-				PreprocessorDefinitions="DEBUG;INC_OLE2;WINVER=0x0400;_X86_=1;STRICT;_WINDOWS;WIN32;STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="3"
-				DebugInformationFormat="3"
-				CallingConvention="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="libmp3lame.lib ..\DShow\strmbasD.lib vfw32.lib winmm.lib version.lib Comdlg32.lib comctl32.lib quartz.lib msvcrtd.lib"
-			...
 
[truncated message content]

[Lame-cvs] SF.net SVN: lame:[6468] trunk/lame/frontend/get_audio.c

[<ale...@us...>]

Revision: 6468
          http://sourceforge.net/p/lame/svn/6468
Author:   aleidinger
Date:     2020-08-19 12:45:47 +0000 (Wed, 19 Aug 2020)
Log Message:
-----------
On Win32 compiles it can happen that lame.exe and libmp3lame.dll use
different C++ runtimes, which maintail different FILE* lists, and
fileno() would produce invalid file numbers for those msvcrt instances.
So use mpg123_replace_reader_handle() / mpg123_open_handle() here
instead of mpg123_open_fd().

Submitted by:	Michael Fink via [patches:#90]

Modified Paths:
--------------
    trunk/lame/frontend/get_audio.c

Modified: trunk/lame/frontend/get_audio.c
===================================================================
--- trunk/lame/frontend/get_audio.c	2020-08-19 12:36:50 UTC (rev 6467)
+++ trunk/lame/frontend/get_audio.c	2020-08-19 12:45:47 UTC (rev 6468)
@@ -2098,6 +2098,25 @@
 #ifdef HAVE_MPG123
 #define CHECK123(code) if(MPG123_OK != (code)) return -1
 
+#ifdef _WIN32
+static ssize_t lame123_read_from_file(void* handle, void* buffer, size_t size)
+{
+   return fread(buffer, 1, size, (FILE*)handle);
+}
+
+static off_t lame123_seek_in_file(void* handle, off_t offset, int direction)
+{
+   if (fseek((FILE*)handle, offset, direction) != 0)
+      return (off_t)-1;
+   return ftell((FILE*)handle);
+}
+
+static void lame123_cleanup_file(void* handle)
+{
+   fclose((FILE*)handle);
+}
+#endif
+
 int lame123_decode_initfile(FILE *fd, mp3data_struct *mp3data, int *enc_delay, int *enc_padding)
 {
     off_t len;
@@ -2124,7 +2143,17 @@
     CHECK123(mpg123_format2(global.hip->mh,
         0, MPG123_MONO|MPG123_STEREO, MPG123_ENC_SIGNED_16));
     /* TODO: verboseness / silence set up */
+#ifdef _WIN32
+    /* On Win32 compiles it can happen that lame.exe and libmp3lame.dll use
+       different C++ runtimes, which maintail different FILE* lists, and
+       fileno() would produce invalid file numbers for those msvcrt instances.
+       So use mpg123_replace_reader_handle() / mpg123_open_handle() here
+       instead of mpg123_open_fd(). */
+    CHECK123(mpg123_replace_reader_handle(global.hip->mh, lame123_read_from_file, lame123_seek_in_file, lame123_cleanup_file));
+    CHECK123(mpg123_open_handle(global.hip->mh, fd));
+#else
     CHECK123(mpg123_open_fd(global.hip->mh, fileno(fd)));
+#endif
     /* Seek to get past Info frame and ID3v2. */
     CHECK123(mpg123_seek(global.hip->mh, SEEK_SET, 0));
     /* TODO: Figure out if MPG123_GAPLESS is desired or not. */

[Lame-cvs] SF.net SVN: lame:[6467] trunk/lame/libmp3lame/version.h

[<ale...@us...>]

Revision: 6467
          http://sourceforge.net/p/lame/svn/6467
Author:   aleidinger
Date:     2020-08-19 12:36:50 +0000 (Wed, 19 Aug 2020)
Log Message:
-----------
Change the URL of the LAME webpage to the canonical https location.

Submitted by:	Michael Fink via [patches:#89]

Modified Paths:
--------------
    trunk/lame/libmp3lame/version.h

Modified: trunk/lame/libmp3lame/version.h
===================================================================
--- trunk/lame/libmp3lame/version.h	2020-08-19 12:29:01 UTC (rev 6466)
+++ trunk/lame/libmp3lame/version.h	2020-08-19 12:36:50 UTC (rev 6467)
@@ -31,7 +31,7 @@
 # define STR(x)    __STR(x)
 #endif
 
-# define LAME_URL              "http://lame.sf.net"
+# define LAME_URL              "https://lame.sourceforge.io"
 
 
 # define LAME_MAJOR_VERSION      3 /* Major version number */

[Lame-cvs] SF.net SVN: lame:[6466] trunk/lame/ACM/ACM.cpp

[<ale...@us...>]

Revision: 6466
          http://sourceforge.net/p/lame/svn/6466
Author:   aleidinger
Date:     2020-08-19 12:29:01 +0000 (Wed, 19 Aug 2020)
Log Message:
-----------
An obsolete method TranslateURL() is called which is not strictly necessary.
The patch is in the ACM module, which is the ancient Windows "Audio Codec
Manager". Applying this patch is necessary before applying the Visual Studio
2019 project files patch.

Submitted by:	Michael Fink via [patches:#88]

Modified Paths:
--------------
    trunk/lame/ACM/ACM.cpp

Modified: trunk/lame/ACM/ACM.cpp
===================================================================
--- trunk/lame/ACM/ACM.cpp	2020-07-11 10:24:36 UTC (rev 6465)
+++ trunk/lame/ACM/ACM.cpp	2020-08-19 12:29:01 UTC (rev 6466)
@@ -249,12 +249,7 @@
 
 				if (bUrl)
 				{
-					LPSTR tmpStr;
-					HRESULT hresult = ::TranslateURL(Url, TRANSLATEURL_FL_GUESS_PROTOCOL|TRANSLATEURL_FL_GUESS_PROTOCOL, &tmpStr);
-					if (hresult == S_OK)
-						::ShellExecute(hwndDlg,"open",tmpStr,NULL,"",SW_SHOWMAXIMIZED );
-					else if (hresult == S_FALSE)
-						::ShellExecute(hwndDlg,"open",Url,NULL,"",SW_SHOWMAXIMIZED );
+					::ShellExecute(hwndDlg,"open",Url,NULL,"",SW_SHOWMAXIMIZED );
 				}
 
 			}

[Lame-cvs] SF.net SVN: lame:[6465] trunk/lame

[<ale...@us...>]

Revision: 6465
          http://sourceforge.net/p/lame/svn/6465
Author:   aleidinger
Date:     2020-07-11 10:24:36 +0000 (Sat, 11 Jul 2020)
Log Message:
-----------
Replace mpeg decoder with external libmpg123 - step 1/2 part 3/3

Step 1 is to allow to use external libmp123 (preferred) or
interal mpglib to decode mpeg audio.

Patch by Thomas Orgis <tho...@or...>, with some
minor modifications to the autotools build by me.

Part 3: Regenerate automake stuff.



Step 2 would be to remove the internal mpglib.

Modified Paths:
--------------
    trunk/lame/ACM/ADbg/Makefile.in
    trunk/lame/ACM/Makefile.in
    trunk/lame/ACM/ddk/Makefile.in
    trunk/lame/ACM/tinyxml/Makefile.in
    trunk/lame/Dll/Makefile.in
    trunk/lame/Makefile.in
    trunk/lame/doc/Makefile.in
    trunk/lame/doc/html/Makefile.in
    trunk/lame/doc/man/Makefile.in
    trunk/lame/dshow/Makefile.in
    trunk/lame/frontend/Makefile.in
    trunk/lame/include/Makefile.in
    trunk/lame/libmp3lame/Makefile.in
    trunk/lame/libmp3lame/i386/Makefile.in
    trunk/lame/libmp3lame/vector/Makefile.in
    trunk/lame/mac/Makefile.in
    trunk/lame/macosx/English.lproj/Makefile.in
    trunk/lame/macosx/LAME.xcodeproj/Makefile.in
    trunk/lame/macosx/Makefile.in
    trunk/lame/misc/Makefile.in
    trunk/lame/mpglib/Makefile.in
    trunk/lame/vc_solution/Makefile.in

Modified: trunk/lame/ACM/ADbg/Makefile.in
===================================================================
--- trunk/lame/ACM/ADbg/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/ACM/ADbg/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/ACM/Makefile.in
===================================================================
--- trunk/lame/ACM/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/ACM/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -230,6 +230,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -316,6 +317,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/ACM/ddk/Makefile.in
===================================================================
--- trunk/lame/ACM/ddk/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/ACM/ddk/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/ACM/tinyxml/Makefile.in
===================================================================
--- trunk/lame/ACM/tinyxml/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/ACM/tinyxml/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/Dll/Makefile.in
===================================================================
--- trunk/lame/Dll/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/Dll/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/Makefile.in
===================================================================
--- trunk/lame/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -253,6 +253,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -339,6 +340,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/doc/Makefile.in
===================================================================
--- trunk/lame/doc/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/doc/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -230,6 +230,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -316,6 +317,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/doc/html/Makefile.in
===================================================================
--- trunk/lame/doc/html/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/doc/html/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -197,6 +197,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -283,6 +284,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/doc/man/Makefile.in
===================================================================
--- trunk/lame/doc/man/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/doc/man/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -198,6 +198,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -284,6 +285,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/dshow/Makefile.in
===================================================================
--- trunk/lame/dshow/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/dshow/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/frontend/Makefile.in
===================================================================
--- trunk/lame/frontend/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/frontend/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -232,7 +232,9 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
-INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
+INCLUDES = @INCLUDES@ -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include \
+	-I$(top_srcdir) -I$(top_builddir)
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -245,6 +247,7 @@
 
 LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -331,6 +334,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/include/Makefile.in
===================================================================
--- trunk/lame/include/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/include/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -219,6 +219,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -305,6 +306,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/libmp3lame/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/libmp3lame/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -302,7 +302,7 @@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
-INCLUDES = @INCLUDES@ -I$(top_srcdir)/mpglib -I$(top_builddir)
+INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_builddir)
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -312,6 +312,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -398,6 +399,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -419,7 +422,7 @@
 @LIB_WITH_DECODER_FALSE@decoder_ldadd = 
 @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
 libmp3lame_la_LIBADD = $(cpu_ldadd) $(vector_ldadd) $(decoder_ldadd) \
-			$(CONFIG_MATH_LIB)
+			@LIBMP3LAME_LDADD@ $(CONFIG_MATH_LIB)
 
 libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
 			-export-symbols $(top_srcdir)/include/libmp3lame.sym \

Modified: trunk/lame/libmp3lame/i386/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/i386/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/libmp3lame/i386/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -203,6 +203,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -289,6 +290,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/libmp3lame/vector/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/vector/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/libmp3lame/vector/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -233,6 +233,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -319,6 +320,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/mac/Makefile.in
===================================================================
--- trunk/lame/mac/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/mac/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/macosx/English.lproj/Makefile.in
===================================================================
--- trunk/lame/macosx/English.lproj/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/macosx/English.lproj/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/macosx/LAME.xcodeproj/Makefile.in
===================================================================
--- trunk/lame/macosx/LAME.xcodeproj/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/macosx/LAME.xcodeproj/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/macosx/Makefile.in
===================================================================
--- trunk/lame/macosx/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/macosx/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -230,6 +230,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -316,6 +317,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/misc/Makefile.in
===================================================================
--- trunk/lame/misc/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/misc/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -229,6 +229,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -315,6 +316,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

Modified: trunk/lame/mpglib/Makefile.in
===================================================================
--- trunk/lame/mpglib/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/mpglib/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -91,6 +91,15 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@LIB_WITH_DECODER_FALSE@am__append_1 = common.c \
+@LIB_WITH_DECODER_FALSE@	dct64_i386.c \
+@LIB_WITH_DECODER_FALSE@	decode_i386.c \
+@LIB_WITH_DECODER_FALSE@	interface.c \
+@LIB_WITH_DECODER_FALSE@	layer1.c \
+@LIB_WITH_DECODER_FALSE@	layer2.c \
+@LIB_WITH_DECODER_FALSE@	layer3.c \
+@LIB_WITH_DECODER_FALSE@	tabinit.c
+
 subdir = mpglib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -105,13 +114,18 @@
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libmpgdecoder_la_LIBADD =
-am_libmpgdecoder_la_OBJECTS = common.lo dct64_i386.lo decode_i386.lo \
-	interface.lo layer1.lo layer2.lo layer3.lo tabinit.lo
+am__libmpgdecoder_la_SOURCES_DIST = common.c dct64_i386.c \
+	decode_i386.c interface.c layer1.c layer2.c layer3.c tabinit.c
+@LIB_WITH_DECODER_TRUE@am_libmpgdecoder_la_OBJECTS = common.lo \
+@LIB_WITH_DECODER_TRUE@	dct64_i386.lo decode_i386.lo \
+@LIB_WITH_DECODER_TRUE@	interface.lo layer1.lo layer2.lo \
+@LIB_WITH_DECODER_TRUE@	layer3.lo tabinit.lo
 libmpgdecoder_la_OBJECTS = $(am_libmpgdecoder_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+@LIB_WITH_DECODER_TRUE@am_libmpgdecoder_la_rpath =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -124,7 +138,6 @@
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/common.Plo \
@@ -152,7 +165,7 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libmpgdecoder_la_SOURCES)
-DIST_SOURCES = $(libmpgdecoder_la_SOURCES)
+DIST_SOURCES = $(am__libmpgdecoder_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -229,6 +242,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -315,6 +329,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -329,20 +345,19 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.15 foreign
-EXTRA_DIST = \
-	AUTHORS \
-	README
+# Avoid -I. which obscures libmpg123's mpg123.h
+DEFAULT_INCLUDES = 
+EXTRA_DIST = AUTHORS README $(am__append_1)
+@LIB_WITH_DECODER_TRUE@noinst_LTLIBRARIES = libmpgdecoder.la
+@LIB_WITH_DECODER_TRUE@libmpgdecoder_la_SOURCES = common.c \
+@LIB_WITH_DECODER_TRUE@	dct64_i386.c \
+@LIB_WITH_DECODER_TRUE@	decode_i386.c \
+@LIB_WITH_DECODER_TRUE@	interface.c \
+@LIB_WITH_DECODER_TRUE@	layer1.c \
+@LIB_WITH_DECODER_TRUE@	layer2.c \
+@LIB_WITH_DECODER_TRUE@	layer3.c \
+@LIB_WITH_DECODER_TRUE@	tabinit.c
 
-noinst_LTLIBRARIES = libmpgdecoder.la
-libmpgdecoder_la_SOURCES = common.c \
-	dct64_i386.c \
-	decode_i386.c \
-	interface.c \
-	layer1.c \
-	layer2.c \
-	layer3.c \
-	tabinit.c
-
 noinst_HEADERS = common.h \
 	dct64_i386.h \
 	decode_i386.h \
@@ -413,7 +428,7 @@
 	}
 
 libmpgdecoder.la: $(libmpgdecoder_la_OBJECTS) $(libmpgdecoder_la_DEPENDENCIES) $(EXTRA_libmpgdecoder_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libmpgdecoder_la_OBJECTS) $(libmpgdecoder_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(am_libmpgdecoder_la_rpath) $(libmpgdecoder_la_OBJECTS) $(libmpgdecoder_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)

Modified: trunk/lame/vc_solution/Makefile.in
===================================================================
--- trunk/lame/vc_solution/Makefile.in	2020-07-11 10:23:48 UTC (rev 6464)
+++ trunk/lame/vc_solution/Makefile.in	2020-07-11 10:24:36 UTC (rev 6465)
@@ -170,6 +170,7 @@
 LDADD = @LDADD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
+LIBMP3LAME_LDADD = @LIBMP3LAME_LDADD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -256,6 +257,8 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mpg123_CFLAGS = @mpg123_CFLAGS@
+mpg123_LIBS = @mpg123_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@

[Lame-cvs] SF.net SVN: lame:[6464] trunk/lame

[<ale...@us...>]

Revision: 6464
          http://sourceforge.net/p/lame/svn/6464
Author:   aleidinger
Date:     2020-07-11 10:23:48 +0000 (Sat, 11 Jul 2020)
Log Message:
-----------
Replace mpeg decoder with external libmpg123 - step 1/2 part 2/3

Step 1 is to allow to use external libmp123 (preferred) or
interal mpglib to decode mpeg audio.

Patch by Thomas Orgis <tho...@or...>, with some
minor modifications to the autotools build by me.

Part 2: regenerate autoconf stuff



Step 2 would be to remove the internal mpglib.

Modified Paths:
--------------
    trunk/lame/config.h.in
    trunk/lame/configure

Modified: trunk/lame/config.h.in
===================================================================
--- trunk/lame/config.h.in	2020-07-11 10:23:12 UTC (rev 6463)
+++ trunk/lame/config.h.in	2020-07-11 10:23:48 UTC (rev 6464)
@@ -123,6 +123,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* set to 1 if you have libmpg123 */
+#undef HAVE_MPG123
+
 /* build with mpglib support */
 #undef HAVE_MPGLIB
 

Modified: trunk/lame/configure
===================================================================
--- trunk/lame/configure	2020-07-11 10:23:12 UTC (rev 6463)
+++ trunk/lame/configure	2020-07-11 10:23:48 UTC (rev 6464)
@@ -649,6 +649,7 @@
 LIB_MAJOR_VERSION
 LDADD
 CONFIG_MATH_LIB
+LIBMP3LAME_LDADD
 FRONTEND_LDADD
 FRONTEND_CFLAGS
 FRONTEND_LDFLAGS
@@ -662,11 +663,10 @@
 WITH_XMM_TRUE
 LIB_WITH_DECODER_FALSE
 LIB_WITH_DECODER_TRUE
+mpg123_LIBS
+mpg123_CFLAGS
 SNDFILE_LIBS
 SNDFILE_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
 GTK_LIBS
 GTK_CFLAGS
 GTK_CONFIG
@@ -712,6 +712,9 @@
 LDFLAGS
 CFLAGS
 CC
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 am__include
 MAINT
 MAINTAINER_MODE_FALSE
@@ -818,6 +821,7 @@
 with_fileio
 enable_analyzer_hooks
 enable_decoder
+enable_libmpg123
 enable_frontend
 enable_mp3x
 enable_mp3rtp
@@ -828,6 +832,9 @@
       ac_precious_vars='build_alias
 host_alias
 target_alias
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 CC
 CFLAGS
 LDFLAGS
@@ -835,11 +842,10 @@
 CPPFLAGS
 CPP
 LT_SYS_LIBRARY_PATH
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
 SNDFILE_CFLAGS
-SNDFILE_LIBS'
+SNDFILE_LIBS
+mpg123_CFLAGS
+mpg123_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1480,7 +1486,8 @@
   --disable-gtktest       Do not try to compile and run a test GTK program
   --enable-efence         Use ElectricFence for malloc debugging
   --disable-analyzer-hooks Exclude analyzer hooks
-  --disable-decoder       Exclude mpg123 decoder
+  --disable-decoder          Exclude mpg123 decoder (internal or external)
+  --disable-libmpg123        Disable use of external libmpg123 decoder (normally favoured over internal decoder)
   --disable-frontend      Do not build the lame executable default=build
   --enable-mp3x           Build GTK frame analyzer default=no
   --enable-mp3rtp         Build mp3rtp default=no
@@ -1512,6 +1519,11 @@
                           (no stdin possible currently)
 
 Some influential environment variables:
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1522,15 +1534,13 @@
   CPP         C preprocessor
   LT_SYS_LIBRARY_PATH
               User-defined run-time library search path.
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
   SNDFILE_CFLAGS
               C compiler flags for SNDFILE, overriding pkg-config
   SNDFILE_LIBS
               linker flags for SNDFILE, overriding pkg-config
+  mpg123_CFLAGS
+              C compiler flags for mpg123, overriding pkg-config
+  mpg123_LIBS linker flags for mpg123, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -3308,6 +3318,126 @@
 $as_echo "${_am_result}" >&6; }
 
 
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -17187,126 +17317,6 @@
 
 if test "${CONFIG_FILEIO}" = "sndfile" ; then
 
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
 $as_echo_n "checking for SNDFILE... " >&6; }
@@ -17442,6 +17452,78 @@
 $as_echo "$CONFIG_ANALYZER" >&6; }
 
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123" >&5
+$as_echo_n "checking for mpg123... " >&6; }
+
+if test -n "$mpg123_CFLAGS"; then
+    pkg_cv_mpg123_CFLAGS="$mpg123_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.26.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.26.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_mpg123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.26.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$mpg123_LIBS"; then
+    pkg_cv_mpg123_LIBS="$mpg123_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.26.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.26.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_mpg123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.26.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        mpg123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123 >= 1.26.0" 2>&1`
+        else
+	        mpg123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123 >= 1.26.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$mpg123_PKG_ERRORS" >&5
+
+	HAVE_MPG123="no"
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_MPG123="no"
+else
+	mpg123_CFLAGS=$pkg_cv_mpg123_CFLAGS
+	mpg123_LIBS=$pkg_cv_mpg123_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_MPG123="yes"
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking use of mpg123 decoder" >&5
 $as_echo_n "checking use of mpg123 decoder... " >&6; }
 # Check whether --enable-decoder was given.
@@ -17451,27 +17533,59 @@
   CONFIG_DECODER="yes"
 fi
 
-
- if test "x${CONFIG_DECODER}" = "xyes"; then
-  LIB_WITH_DECODER_TRUE=
-  LIB_WITH_DECODER_FALSE='#'
+# Check whether --enable-libmpg123 was given.
+if test "${enable_libmpg123+set}" = set; then :
+  enableval=$enable_libmpg123; CONFIG_MPG123="${enableval}"
 else
-  LIB_WITH_DECODER_TRUE='#'
-  LIB_WITH_DECODER_FALSE=
+  CONFIG_MPG123="auto"
 fi
 
 
-if test "${CONFIG_DECODER}" != "no" ; then
-	CONFIG_DECODER="yes (Layer 1, 2, 3)"
+if test "${CONFIG_MPG123}" = "yes" && ! test "${HAVE_MPG123}" = "yes"; then
+	as_fn_error $? "libmpg123 decoder enforced but not found" "$LINENO" 5
+fi
+if test "${CONFIG_MPG123}" = "auto" && test "${HAVE_MPG123}" = "yes"; then
+	CONFIG_MPG123="yes"
+fi
 
+LIB_WITH_DECODER=false
+if test "${CONFIG_MPG123}" = "yes" && test "${CONFIG_DECODER}" != "no"; then
+	CONFIG_DECODER="no"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled use of external libmpg123 decoder" >&5
+$as_echo "enabled use of external libmpg123 decoder" >&6; }
+
+$as_echo "#define HAVE_MPG123 1" >>confdefs.h
+
+
+$as_echo "#define DECODE_ON_THE_FLY 1" >>confdefs.h
+
+	FRONTEND_LDADD="$mpg123_LIBS $FRONTEND_LDADD"
+	LIBMP3LAME_LDADD="$mpg123_LIBS $LIBMP3LAME_LDADD"
+	INCLUDES="$mpg123_CFLAGS $INCLUDES"
+else
+	if test "${CONFIG_DECODER}" != "no" ; then
+		LIB_WITH_DECODER=true
+		CONFIG_DECODER="internal mpglib decoder (Layer 1, 2, 3)"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_DECODER" >&5
+$as_echo "$CONFIG_DECODER" >&6; }
+
 $as_echo "#define HAVE_MPGLIB 1" >>confdefs.h
 
 
 $as_echo "#define DECODE_ON_THE_FLY 1" >>confdefs.h
 
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_DECODER" >&5
+$as_echo "$CONFIG_DECODER" >&6; }
+	fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_DECODER" >&5
-$as_echo "$CONFIG_DECODER" >&6; }
+ if ${LIB_WITH_DECODER}; then
+  LIB_WITH_DECODER_TRUE=
+  LIB_WITH_DECODER_FALSE='#'
+else
+  LIB_WITH_DECODER_TRUE='#'
+  LIB_WITH_DECODER_FALSE=
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the lame frontend should be build" >&5
@@ -18328,6 +18442,7 @@
 
 
 
+
 ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile libmp3lame/vector/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile macosx/Makefile macosx/English.lproj/Makefile macosx/LAME.xcodeproj/Makefile vc_solution/Makefile"
 
 

[Lame-cvs] SF.net SVN: lame:[6463] trunk/lame/configure.in

[<ale...@us...>]

Revision: 6463
          http://sourceforge.net/p/lame/svn/6463
Author:   aleidinger
Date:     2020-07-11 10:23:12 +0000 (Sat, 11 Jul 2020)
Log Message:
-----------
Replace mpeg decoder with external libmpg123 - step 1/2 part 1/3

Step 1 is to allow to use external libmp123 (preferred) or
interal mpglib to decode mpeg audio.

Patch by Thomas Orgis <tho...@or...>, with some
minor modifications to the autotools build by me.

Part 1: commit the source files and the input files for the build.



Step 2 would be to remove the internal mpglib.

Modified Paths:
--------------
    trunk/lame/configure.in

Modified: trunk/lame/configure.in
===================================================================
--- trunk/lame/configure.in	2020-07-11 10:22:15 UTC (rev 6462)
+++ trunk/lame/configure.in	2020-07-11 10:23:12 UTC (rev 6463)
@@ -17,6 +17,9 @@
 dnl FRONTEND_CFLAGS
 dnl FRONTEND_LDADD
 
+dnl extra vars for libmp3lame:
+dnl LIBMP3LAME_LDADD
+
 AC_PREREQ(2.69)
 AC_INIT([lame],[3.100],[lam...@li...])
 AC_CONFIG_SRCDIR([libmp3lame/lame.c])
@@ -35,6 +38,7 @@
 AH_BOTTOM([#endif /* LAME_CONFIG_H */])
 AM_MAINTAINER_MODE
 AM_MAKE_INCLUDE
+PKG_PROG_PKG_CONFIG([])
 
 dnl check environment
 AC_AIX
@@ -545,21 +549,45 @@
 
 
 dnl mpg123 decoder
+PKG_CHECK_MODULES([mpg123], [libmpg123 >= 1.26.0], [HAVE_MPG123="yes"], [HAVE_MPG123="no"])
+
 AC_MSG_CHECKING(use of mpg123 decoder)
 AC_ARG_ENABLE(decoder,
-  [  --disable-decoder       Exclude mpg123 decoder],
+  [  --disable-decoder          Exclude mpg123 decoder (internal or external)],
   CONFIG_DECODER="${enableval}", CONFIG_DECODER="yes")
+AC_ARG_ENABLE(libmpg123,
+  [  --disable-libmpg123        Disable use of external libmpg123 decoder (normally favoured over internal decoder)],
+  CONFIG_MPG123="${enableval}", CONFIG_MPG123="auto")
 
-AM_CONDITIONAL(LIB_WITH_DECODER, test "x${CONFIG_DECODER}" = "xyes")
+if test "${CONFIG_MPG123}" = "yes" && ! test "${HAVE_MPG123}" = "yes"; then
+	AC_MSG_ERROR([libmpg123 decoder enforced but not found])
+fi
+if test "${CONFIG_MPG123}" = "auto" && test "${HAVE_MPG123}" = "yes"; then
+	CONFIG_MPG123="yes"
+fi
 
-if test "${CONFIG_DECODER}" != "no" ; then
-	CONFIG_DECODER="yes (Layer 1, 2, 3)"
-	AC_DEFINE(HAVE_MPGLIB, 1, build with mpglib support)
+LIB_WITH_DECODER=false
+if test "${CONFIG_MPG123}" = "yes" && test "${CONFIG_DECODER}" != "no"; then
+	CONFIG_DECODER="no"
+	AC_MSG_RESULT(enabled use of external libmpg123 decoder)
+	AC_DEFINE(HAVE_MPG123, 1, set to 1 if you have libmpg123)
 	AC_DEFINE(DECODE_ON_THE_FLY, 1, allow to compute a more accurate replaygain value)
+	FRONTEND_LDADD="$mpg123_LIBS $FRONTEND_LDADD"
+	LIBMP3LAME_LDADD="$mpg123_LIBS $LIBMP3LAME_LDADD"
+	INCLUDES="$mpg123_CFLAGS $INCLUDES"
+else
+	if test "${CONFIG_DECODER}" != "no" ; then
+		LIB_WITH_DECODER=true
+		CONFIG_DECODER="internal mpglib decoder (Layer 1, 2, 3)"
+		AC_MSG_RESULT($CONFIG_DECODER)
+		AC_DEFINE(HAVE_MPGLIB, 1, build with mpglib support)
+		AC_DEFINE(DECODE_ON_THE_FLY, 1, allow to compute a more accurate replaygain value)
+	else
+		AC_MSG_RESULT($CONFIG_DECODER)
+	fi
 fi
-AC_MSG_RESULT($CONFIG_DECODER)
+AM_CONDITIONAL(LIB_WITH_DECODER, ${LIB_WITH_DECODER})
 
-
 AC_MSG_CHECKING(if the lame frontend should be build)
 AC_ARG_ENABLE(frontend,
   [  --disable-frontend      Do not build the lame executable [default=build]],
@@ -1224,6 +1252,7 @@
 AC_SUBST(FRONTEND_LDFLAGS)
 AC_SUBST(FRONTEND_CFLAGS)
 AC_SUBST(FRONTEND_LDADD)
+AC_SUBST(LIBMP3LAME_LDADD)
 AC_SUBST(CONFIG_MATH_LIB)
 AC_SUBST(LDADD)
 

[Lame-cvs] SF.net SVN: lame:[6462] trunk/lame

[<ale...@us...>]

Revision: 6462
          http://sourceforge.net/p/lame/svn/6462
Author:   aleidinger
Date:     2020-07-11 10:22:15 +0000 (Sat, 11 Jul 2020)
Log Message:
-----------
Replace mpeg decoder with external libmpg123 - step 1/2 part 1/3

Step 1 is to allow to use external libmp123 (preferred) or
interal mpglib to decode mpeg audio.

Patch by Thomas Orgis <tho...@or...>, with some
minor modifications to the autotools build by me.

Part 1: commit the source files and the input files for the build.



Step 2 would be to remove the internal mpglib.

Modified Paths:
--------------
    trunk/lame/frontend/Makefile.am
    trunk/lame/frontend/get_audio.c
    trunk/lame/frontend/parse.c
    trunk/lame/include/lame.h
    trunk/lame/libmp3lame/Makefile.am
    trunk/lame/libmp3lame/mpglib_interface.c
    trunk/lame/libmp3lame/util.h
    trunk/lame/mpglib/Makefile.am
    trunk/lame/mpglib/common.h
    trunk/lame/mpglib/mpglib.h
    trunk/lame/mpglib/tabinit.c
    trunk/lame/mpglib/tabinit.h

Modified: trunk/lame/frontend/Makefile.am
===================================================================
--- trunk/lame/frontend/Makefile.am	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/frontend/Makefile.am	2020-07-11 10:22:15 UTC (rev 6462)
@@ -38,7 +38,8 @@
 CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
 LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
 
-INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
+INCLUDES = @INCLUDES@ -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include \
+	-I$(top_srcdir) -I$(top_builddir)
 
 LDADD = @LDADD@ \
 	$(top_builddir)/libmp3lame/libmp3lame.la \

Modified: trunk/lame/frontend/get_audio.c
===================================================================
--- trunk/lame/frontend/get_audio.c	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/frontend/get_audio.c	2020-07-11 10:22:15 UTC (rev 6462)
@@ -58,6 +58,16 @@
 # endif
 #endif
 
+#if defined(HAVE_MPGLIB) || defined(HAVE_MPG123)
+#define hip_global_struct mpstr_tag
+#endif
+#ifdef HAVE_MPG123
+#include <mpg123.h>
+/* for mpstr_tag */
+#include "mpglib/mpglib.h"
+
+#endif
+
 #define         MAX_U_32_NUM            0xFFFFFFFF
 
 
@@ -356,7 +366,10 @@
     unsigned int num_samples_read;
     FILE   *music_in;
     SNDFILE *snd_file;
-    hip_t   hip;
+#ifdef HAVE_MPG123
+    mpg123_handle* mh;
+#endif
+    hip_t     hip;
     PcmBuffer pcm32;
     PcmBuffer pcm16;
     size_t  in_id3v2_size;
@@ -372,6 +385,9 @@
 #else
 int     lame_decode_initfile(FILE * fd, mp3data_struct * mp3data, int *enc_delay, int *enc_padding);
 #endif
+#ifdef HAVE_MPG123
+int     lame123_decode_initfile(FILE * fd, mp3data_struct * mp3data, int *enc_delay, int *enc_padding);
+#endif
 
 /* read mp3 file until mpglib returns one frame of PCM data */
 static int lame_decode_fromfile(FILE * fd, short int pcm_l[], short int pcm_r[],
@@ -550,10 +566,23 @@
 setSkipStartAndEnd(lame_t gfp, int enc_delay, int enc_padding)
 {
     int     skip_start = 0, skip_end = 0;
+    long dec_delay = -1;
 
     if (global_decoder.mp3_delay_set)
         skip_start = global_decoder.mp3_delay;
 
+#if 0
+    /* We should ask mpg123 for the delay, but we know it is 529 samples and
+       will not change unless we enable gapless mode. Also, global.hip is not
+       always the correct handle, so avoid this for now. */
+    /* Will use it for layer III only, mpg123 does not deal with layer I and II
+       gapless stuff (yet?) */
+    mpg123_getstate(global.hip->mh, MPG123_DEC_DELAY, &dec_delay, NULL);
+#else
+    if(dec_delay < 0)
+        dec_delay = 528 + 1; /* Same value as above, actually. */
+#endif
+
     switch (global_reader.input_format) {
     case sf_mp123:
         break;
@@ -562,16 +591,16 @@
         if (skip_start == 0) {
             if (enc_delay > -1 || enc_padding > -1) {
                 if (enc_delay > -1)
-                    skip_start = enc_delay + 528 + 1;
+                    skip_start = enc_delay + dec_delay;
                 if (enc_padding > -1)
-                    skip_end = enc_padding - (528 + 1);
+                    skip_end = enc_padding - dec_delay;
             }
             else
-                skip_start = lame_get_encoder_delay(gfp) + 528 + 1;
+                skip_start = lame_get_encoder_delay(gfp) + dec_delay;
         }
         else {
             /* user specified a value of skip. just add for decoder */
-            skip_start += 528 + 1; /* mp3 decoder has a 528 sample delay, plus user supplied "skip" */
+            skip_start += dec_delay; /* mp3 decoder has a 528 sample delay, plus user supplied "skip" */
         }
         break;
     case sf_mp2:
@@ -658,7 +687,7 @@
 void
 close_infile(void)
 {
-#if defined(HAVE_MPGLIB)
+#if defined(HAVE_MPGLIB) || defined(HAVE_MPG123)
     if (global.hip != 0) {
         hip_decode_exit(global.hip); /* release mp3decoder memory */
         global. hip = 0;
@@ -893,10 +922,42 @@
 read_samples_mp3(lame_t gfp, FILE * musicin, short int mpg123pcm[2][1152])
 {
     int     out;
-#if defined(AMIGA_MPEGA)  ||  defined(HAVE_MPGLIB)
+#ifdef HAVE_MPG123
+    short int *outbuf;
+    size_t outbytes;
+#endif
+#if defined(AMIGA_MPEGA)  ||  defined(HAVE_MPGLIB) || defined(HAVE_MPG123)
     int     samplerate;
     static const char type_name[] = "MP3 file";
 
+#ifdef HAVE_MPG123
+    /* Need to deinterleave so rather use mpg123_decode_frame() to decode the
+       current frame and deinterleave from the internal buffer. */
+    out = mpg123_decode_frame(global.hip->mh, NULL, (unsigned char**)&outbuf, &outbytes);
+    if (out != MPG123_OK && out != MPG123_DONE)
+    {
+        if (out == MPG123_NEW_FORMAT)
+        {
+            if (global_ui_config.silent < 10) {
+                error_printf("Error: format changed in %s - not supported\n",
+                    type_name);
+            }
+        }
+        return -1;
+    }
+    out = outbytes/(sizeof(short)*global_decoder.mp3input_data.stereo);
+    if (global_decoder.mp3input_data.stereo == 2) {
+        int i;
+        for (i=0; i<out; ++i) {
+            mpg123pcm[0][i] = *outbuf++;
+            mpg123pcm[1][i] = *outbuf++;
+        }
+    }
+    else
+        memcpy(mpg123pcm[0], outbuf, sizeof(short)*out);
+    if(global.hip->pinfo)
+        hip_finish_pinfo(global.hip);
+#else
     out = lame_decode_fromfile(musicin, mpg123pcm[0], mpg123pcm[1], &global_decoder.mp3input_data);
     /*
      * out < 0:  error, probably EOF
@@ -925,6 +986,7 @@
         }
         out = -1;
     }
+#endif
 #else
     out = -1;
 #endif
@@ -1791,6 +1853,14 @@
 static int
 open_mpeg_file_part2(lame_t gfp, FILE* musicin, char const *inPath, int *enc_delay, int *enc_padding)
 {
+#ifdef HAVE_MPG123
+    if (-1 == lame123_decode_initfile(musicin, &global_decoder.mp3input_data, enc_delay, enc_padding)) {
+        if (global_ui_config.silent < 10) {
+            error_printf("Error opening MPEG input file %s.\n", inPath);
+        }
+        return 0;
+    }
+#else
 #ifdef HAVE_MPGLIB
     if (-1 == lame_decode_initfile(musicin, &global_decoder.mp3input_data, enc_delay, enc_padding)) {
         if (global_ui_config.silent < 10) {
@@ -1799,6 +1869,7 @@
         return 0;
     }
 #endif
+#endif
     if (!set_input_num_channels(gfp, global_decoder.mp3input_data.stereo)) {
         return 0;
     }
@@ -2022,7 +2093,98 @@
     unsigned int b3 = buf[3] & 127;
     return (((((b0 << 7) + b1) << 7) + b2) << 7) + b3;
 }
+#endif
 
+#ifdef HAVE_MPG123
+#define CHECK123(code) if(MPG123_OK != (code)) return -1
+
+int lame123_decode_initfile(FILE *fd, mp3data_struct *mp3data, int *enc_delay, int *enc_padding)
+{
+    off_t len;
+    unsigned char *id3buf;
+    size_t id3size;
+    struct mpg123_frameinfo fi;
+    long rate, val;
+    int channels;
+
+    mpg123_init();
+    memset(mp3data, 0, sizeof(mp3data_struct));
+    if (global.hip) {
+        hip_decode_exit(global.hip);
+    }
+    global. hip = hip_decode_init();
+    if(!global.hip->mh)
+        return -1;
+    /* TODO: enforce float format ... optionally be careful for builds
+       that only know 16 bit output. */
+    mpg123_param(global.hip->mh, MPG123_ADD_FLAGS, MPG123_STORE_RAW_ID3, 0.);
+    mpg123_param(global.hip->mh, MPG123_ADD_FLAGS, MPG123_QUIET, 0.);
+    mpg123_format_none(global.hip->mh);
+    /* TODO: switch to MPG123_ENC_FLOAT_32, always! */
+    CHECK123(mpg123_format2(global.hip->mh,
+        0, MPG123_MONO|MPG123_STEREO, MPG123_ENC_SIGNED_16));
+    /* TODO: verboseness / silence set up */
+    CHECK123(mpg123_open_fd(global.hip->mh, fileno(fd)));
+    /* Seek to get past Info frame and ID3v2. */
+    CHECK123(mpg123_seek(global.hip->mh, SEEK_SET, 0));
+    /* TODO: Figure out if MPG123_GAPLESS is desired or not. */
+    /* Guessing seems to be OK, so we do not have to insist on knowing
+       if libmpg123 got that info from Info tag or not. */
+    /* I am paranoid about off_t being larger than long or int. */
+    len = mpg123_framelength(global.hip->mh);
+    if(len <= (unsigned long)-1)
+        mp3data->totalframes = len;
+    else
+        return -1;
+    len = mpg123_length(global.hip->mh);
+    if(len <= ((unsigned int)-1)/2)
+        mp3data->nsamp = len;
+    else
+        return -1;
+    /* Encoder delay and padding are not needed when libmpg123 handles gapless
+       decoding itself. So let's see if we get away with that. */
+    mpg123_getstate(global.hip->mh, MPG123_ENC_DELAY, &val, NULL);
+    *enc_delay = val;
+    mpg123_getstate(global.hip->mh, MPG123_ENC_PADDING, &val, NULL);
+    *enc_padding = val;
+    if(global.in_id3v2_tag)
+        free(global.in_id3v2_tag);
+    global.in_id3v2_size = 0;
+    if( MPG123_OK == mpg123_id3_raw(global.hip->mh, NULL, NULL,
+        &id3buf, &id3size) && id3buf && id3size ) {
+        global.in_id3v2_tag = malloc(id3size);
+        if(global.in_id3v2_tag) {
+            memcpy(global.in_id3v2_tag, id3buf, id3size);
+            global.in_id3v2_size = id3size;
+        }
+    }
+    CHECK123(mpg123_info(global.hip->mh, &fi));
+    CHECK123(mpg123_getformat(global.hip->mh, &rate, &channels, NULL));
+    /* How much of this is actually needed for the frontend? */
+    mp3data->header_parsed = 1;
+    mp3data->stereo = channels; /* Channel count correct? Or is dual mono different? */
+    mp3data->samplerate = rate;
+    mp3data->mode = fi.mode;
+    mp3data->mode_ext = fi.mode_ext;
+    mp3data->framesize = mpg123_spf(global.hip->mh);
+    mp3data->bitrate = fi.bitrate;
+    if(global_reader.input_format == sf_mp123) switch(fi.layer) {
+        case 1:
+            global_reader.input_format = sf_mp1;
+        break;
+        case 2:
+            global_reader.input_format = sf_mp2;
+        break;
+        case 3:
+            global_reader.input_format = sf_mp3;
+        break;
+    }
+
+    return 0;
+}
+#endif
+
+#ifdef HAVE_MPGLIB
 int
 lame_decode_initfile(FILE * fd, mp3data_struct * mp3data, int *enc_delay, int *enc_padding)
 {

Modified: trunk/lame/frontend/parse.c
===================================================================
--- trunk/lame/frontend/parse.c	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/frontend/parse.c	2020-07-11 10:22:15 UTC (rev 6462)
@@ -2558,7 +2558,7 @@
     if (global_reader.input_format == sf_unknown)
         global_reader.input_format = filename_to_type(inPath);
 
-#if !(defined HAVE_MPGLIB || defined AMIGA_MPEGA)
+#if !(defined HAVE_MPGLIB || defined AMIGA_MPEGA || HAVE_MPG123)
     if (is_mpeg_file_format(global_reader.input_format)) {
         error_printf("Error: libmp3lame not compiled with mpg123 *decoding* support \n");
         return -1;

Modified: trunk/lame/include/lame.h
===================================================================
--- trunk/lame/include/lame.h	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/include/lame.h	2020-07-11 10:22:15 UTC (rev 6462)
@@ -1049,6 +1049,9 @@
 
 /* required call to initialize decoder */
 hip_t CDECL hip_decode_init(void);
+/* With that you don't have to care about MP3 encoder/decoder delay
+   anymore. Only available with libmpg123 (returns NULL otherwise). */
+hip_t CDECL hip_decode_init_gapless(void);
 
 /* cleanup call to exit decoder  */
 int CDECL hip_decode_exit(hip_t gfp);

Modified: trunk/lame/libmp3lame/Makefile.am
===================================================================
--- trunk/lame/libmp3lame/Makefile.am	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/libmp3lame/Makefile.am	2020-07-11 10:22:15 UTC (rev 6462)
@@ -20,12 +20,12 @@
 endif
 
 libmp3lame_la_LIBADD =	$(cpu_ldadd) $(vector_ldadd) $(decoder_ldadd) \
-			$(CONFIG_MATH_LIB)
+			@LIBMP3LAME_LDADD@ $(CONFIG_MATH_LIB)
 libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
 			-export-symbols $(top_srcdir)/include/libmp3lame.sym \
 			-no-undefined
 
-INCLUDES = @INCLUDES@ -I$(top_srcdir)/mpglib -I$(top_builddir)
+INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_builddir)
 
 DEFS = @DEFS@ @CONFIG_DEFS@
 

Modified: trunk/lame/libmp3lame/mpglib_interface.c
===================================================================
--- trunk/lame/libmp3lame/mpglib_interface.c	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/libmp3lame/mpglib_interface.c	2020-07-11 10:22:15 UTC (rev 6462)
@@ -28,17 +28,40 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_MPGLIB
-#define hip_global_struct mpstr_tag 
+#if defined(HAVE_MPGLIB) || defined(HAVE_MPG123)
+#define hip_global_struct mpstr_tag
+
+#ifdef HAVE_MPG123
+
+/* libmpg123 */
+#include <mpg123.h>
+#ifndef MPG123_API_VERSION
+#error "Seems like you got the wrong mpg123 header. No MPG123_API_VERSION defined."
+#endif
+#if (MPG123_API_VERSION < 45)
+#error "Need mpg123 API >= 45."
+#endif
+/* for mpstr_tag */
+#include "mpglib/mpglib.h"
+
+#else
+
+/* mpglib */
+#include "mpglib/interface.h"
+
+#endif
+
 #include "lame.h"
 #include "machine.h"
 #include "encoder.h"
-#include "interface.h"
 
+/* for plotting_data */
+#ifndef NOANALYSIS
+#include "lame-analysis.h"
+#endif
+
 #include "util.h"
 
-
-
 #if DEPRECATED_OR_OBSOLETE_CODE_REMOVED
 /*
  * OBSOLETE:
@@ -79,13 +102,16 @@
 int CDECL lame_decode_exit(void);
 #endif
 
-
+#ifdef HAVE_MPGLIB
 static MPSTR   mp;
+#endif
 
 int
 lame_decode_exit(void)
 {
+#ifdef HAVE_MPGLIB
     ExitMP3(&mp);
+#endif
     return 0;
 }
 
@@ -93,7 +119,9 @@
 int
 lame_decode_init(void)
 {
+#ifdef HAVE_MPGLIB
     (void) InitMP3(&mp);
+#endif
     return 0;
 }
 
@@ -125,6 +153,7 @@
  *  n     number of samples output.  either 576 or 1152 depending on MP3 file.
  */
 
+#ifdef HAVE_MPGLIB
 static int
 decode1_headersB_clipchoice(PMPSTR pmp, unsigned char *buffer, size_t len,
                             char pcm_l_raw[], char pcm_r_raw[], mp3data_struct * mp3data,
@@ -241,6 +270,7 @@
     /*fprintf(stderr,"ret = %i out=%i\n", ret, processed_samples ); */
     return processed_samples;
 }
+#endif
 
 
 #define OUTSIZE_CLIPPED   (4096*sizeof(short))
@@ -252,10 +282,13 @@
                       int *enc_delay, int *enc_padding)
 {
     static char out[OUTSIZE_CLIPPED];
-
+#ifdef HAVE_MPGLIB
     return decode1_headersB_clipchoice(&mp, buffer, len, (char *) pcm_l, (char *) pcm_r, mp3data,
                                        enc_delay, enc_padding, out, OUTSIZE_CLIPPED,
                                        sizeof(short), decodeMP3);
+#else
+    return -1;
+#endif
 }
 
 
@@ -274,8 +307,12 @@
 lame_decode1_headers(unsigned char *buffer,
                      int len, short pcm_l[], short pcm_r[], mp3data_struct * mp3data)
 {
+#ifdef HAVE_MPGLIB
     int     enc_delay, enc_padding;
     return lame_decode1_headersB(buffer, len, pcm_l, pcm_r, mp3data, &enc_delay, &enc_padding);
+#else
+    return -1;
+#endif
 }
 
 
@@ -282,9 +319,13 @@
 int
 lame_decode1(unsigned char *buffer, int len, short pcm_l[], short pcm_r[])
 {
+#ifdef HAVE_MPGLIB
     mp3data_struct mp3data;
 
     return lame_decode1_headers(buffer, len, pcm_l, pcm_r, &mp3data);
+#else
+    return -1;
+#endif
 }
 
 
@@ -299,6 +340,7 @@
 lame_decode_headers(unsigned char *buffer,
                     int len, short pcm_l[], short pcm_r[], mp3data_struct * mp3data)
 {
+#ifdef HAVE_MPGLIB
     int     ret;
     int     totsize = 0;     /* number of decoded samples per channel */
 
@@ -314,6 +356,9 @@
             break;
         }
     }
+#else
+    return -1;
+#endif
 }
 
 
@@ -320,9 +365,13 @@
 int
 lame_decode(unsigned char *buffer, int len, short pcm_l[], short pcm_r[])
 {
+#ifdef HAVE_MPGLIB
     mp3data_struct mp3data;
 
     return lame_decode_headers(buffer, len, pcm_l, pcm_r, &mp3data);
+#else
+    return -1;
+#endif
 }
 
 
@@ -331,21 +380,205 @@
 hip_t hip_decode_init(void)
 {
     hip_t hip = lame_calloc(hip_global_flags, 1);
+    if(!hip)
+        return hip;
+#ifdef HAVE_MPG123
+    mpg123_init();
+    hip->mh = mpg123_new(NULL, NULL);
+    /* Could allocate on demand only. */
+    memset(&hip->mi, 0, sizeof(hip->mi));
+    /* Since encoder delay/padding is communicated, I presume implicit
+       handling of gapless decoding is not expected. */
+    mpg123_param(hip->mh, MPG123_REMOVE_FLAGS, MPG123_GAPLESS, 0.);
+    /* We are going to feed buffers. */
+    if(mpg123_open_feed(hip->mh) != MPG123_OK)
+    {
+        mpg123_delete(hip->mh);
+        free(hip);
+        hip = NULL;
+    }
+#else
     InitMP3(hip);
+#endif
     return hip;
 }
 
+hip_t hip_decode_init_gapless(void)
+{
+    hip_t hip = lame_calloc(hip_global_flags, 1);
+    if(!hip)
+        return hip;
+#ifdef HAVE_MPG123
+    mpg123_init();
+    hip->mh = mpg123_new(NULL, NULL);
+    /* Could allocate on demand only. */
+    memset(&hip->mi, 0, sizeof(hip->mi));
+    /* Default on, but make it explicit. */
+    mpg123_param(hip->mh, MPG123_ADD_FLAGS, MPG123_GAPLESS, 0.);
+    /* We are going to feed buffers. */
+    if(mpg123_open_feed(hip->mh) != MPG123_OK)
+    {
+        mpg123_delete(hip->mh);
+        free(hip);
+        hip = NULL;
+    }
+#else
+    hip = NULL;
+#endif
+    return hip;
+}
 
+
+
 int hip_decode_exit(hip_t hip)
 {
-    if (hip) {
+    if(hip) {
+#ifdef HAVE_MPG123
+        mpg123_delete(hip->mh); /* Closes implicitly. */
+        /* No mpg123_exit(), will be deprecated anyway. */
+#else
         ExitMP3(hip);
+#endif
         free(hip);
     }
     return 0;
 }
 
+#ifdef HAVE_MPG123
+/* One decoding routine to cover all API cases. Any output pointer except pcm_l
+   and pcm_r, which are always required to be able to store full MPEG frame
+   (1152 samples), can be NULL if you are not really interested in it.
+   This always works on one whole MPEG frame, even if sample count can be
+   smaller after gapless handling. TODO: Optionally turn on gapless decoding?
+   If not, the decoder delay also needs to be communicated.
+   Or do we just assume 529 samples? */
 
+int hip123_decode1( hip_t hip, unsigned char *buffer, size_t len,
+    unsigned char *pcm_l, unsigned char *pcm_r,
+    int *enc_delay, int *enc_padding,
+    mp3data_struct *mp3data,
+    int unclipped) /* If true, produce unclipped float (sample_t) output. */
+{
+    int ret;
+    unsigned char *mpg123buf;
+    size_t mpg123fill;
+    long rate;
+    int channels;
+    int encoding;
+    int change_format;
+    int samples = 0;
+    int want_enc = unclipped ? MPG123_ENC_FLOAT_32 : MPG123_ENC_SIGNED_16;
+
+    if(MPG123_OK != mpg123_feed(hip->mh, buffer, len))
+        return -1;
+    ret = mpg123_getformat(hip->mh, &rate, &channels, &encoding);
+    switch(ret) {
+        case MPG123_NEED_MORE:
+            return 0;
+        case MPG123_OK:
+            change_format = encoding != want_enc;
+        break;
+        default:
+            return -1;
+    }
+
+    if(change_format)
+    {
+        mpg123_format_none(hip->mh);
+        mpg123_format2(hip->mh, 0, MPG123_MONO|MPG123_STEREO, want_enc);
+        /* This triggers renegotiation of output format on next decode. */
+        mpg123_decoder(hip->mh, NULL);
+    }
+
+    /* Now decode for real. */
+    mpg123fill = 0; /* Still zero in case of error/need more. */
+    ret = mpg123_decode_frame(hip->mh, NULL, &mpg123buf, &mpg123fill);
+    /* A second time if we just got notified of new format. */
+    if(!mpg123fill && ret == MPG123_NEW_FORMAT)
+    {
+        mpg123_getformat(hip->mh, &rate, &channels, &encoding);
+        ret = mpg123_decode_frame(hip->mh, NULL, &mpg123buf, &mpg123fill);
+        /* True paranoia would check the encoding again. */
+    }
+    if(ret == MPG123_ERR)
+        return -1;
+    /* MPG123_NEED_MORE and MPG123_DONE (not happening here, though)
+        both result in mpg123fill==0, so return 0 here, which is what fits. */
+    samples = mpg123fill /
+        (unclipped ? sizeof(float) : sizeof(short)) / channels;
+    /* Now demultilex the data in mpg123buf into pcm_l and pcm_r. */
+    if(mpg123fill && mpg123buf)
+    {
+        if(unclipped)
+        {
+            /* Lame's sample_t could be wider than 32 bit, right? */
+            sample_t *spcm_l = (sample_t*)pcm_l;
+            sample_t *spcm_r = (sample_t*)pcm_r;
+            float    *srcbuf = (float*)mpg123buf;
+            int i;
+
+            if(channels == 2) {
+                for(i=0; i<samples; ++i) {
+                    spcm_l[i] = *srcbuf++;
+                    spcm_r[i] = *srcbuf++;
+                }
+            }
+            else
+                for(i=0; i<samples; ++i)
+                    spcm_l[i] = *srcbuf++;
+        }
+        else
+        {
+            /* It's all shorts. */
+            short *spcm_l = (short*)pcm_l;
+            short *spcm_r = (short*)pcm_r;
+            short *srcbuf = (short*)mpg123buf;
+            int i;
+
+            if(channels == 2) {
+                for(i=0; i<samples; ++i) {
+                    spcm_l[i] = *srcbuf++;
+                    spcm_r[i] = *srcbuf++;
+                }
+            }
+            else
+                memcpy(pcm_l, mpg123buf, sizeof(short)*samples);
+        }
+    }
+
+    /* If we arrive here, there was some successful parsing of the stream at
+       least, so that meaningful info is available. */
+    if(mp3data) {
+        struct mpg123_frameinfo fi;
+        memset(mp3data, 0, sizeof(mp3data_struct));
+        /* Re-using last returns from getformat() before. */
+        if(MPG123_OK == mpg123_info(hip->mh, &fi)) {
+            mp3data->header_parsed = 1;
+            mp3data->stereo = channels; /* Channel count correct? Or is dual mono different? */
+            mp3data->samplerate = rate;
+            mp3data->mode = fi.mode;
+            mp3data->mode_ext = fi.mode_ext;
+            mp3data->framesize = mpg123_spf(hip->mh);
+            mp3data->bitrate = fi.bitrate;
+        }
+    }
+    if(enc_delay) {
+        long val;
+        mpg123_getstate(hip->mh, MPG123_ENC_DELAY, &val, NULL);
+        *enc_delay = val > INT_MAX ? -1 : val;
+    }
+    if(enc_padding) {
+        long val;
+        mpg123_getstate(hip->mh, MPG123_ENC_PADDING, &val, NULL);
+        *enc_padding = val > INT_MAX ? -1 : val;
+    }
+    if(hip->pinfo)
+        hip_finish_pinfo(hip);
+    return samples;
+}
+#endif
+
+
 /* we forbid input with more than 1152 samples per channel for output in the unclipped mode */
 #define OUTSIZE_UNCLIPPED (1152*2*sizeof(FLOAT))
 
@@ -352,16 +585,21 @@
 int
 hip_decode1_unclipped(hip_t hip, unsigned char *buffer, size_t len, sample_t pcm_l[], sample_t pcm_r[])
 {
-    static char out[OUTSIZE_UNCLIPPED];
-    mp3data_struct mp3data;
-    int     enc_delay, enc_padding;
-
     if (hip) {
+#ifdef HAVE_MPG123
+        return hip123_decode1( hip, buffer, len,
+            (unsigned char*)pcm_l, (unsigned char*)pcm_r,
+            NULL, NULL, NULL, 1 );
+#else
+        mp3data_struct mp3data;
+        static char out[OUTSIZE_UNCLIPPED];
+        int     enc_delay, enc_padding;
         return decode1_headersB_clipchoice(hip, buffer, len, (char *) pcm_l, (char *) pcm_r, &mp3data,
                                            &enc_delay, &enc_padding, out, OUTSIZE_UNCLIPPED,
                                            sizeof(FLOAT), decodeMP3_unclipped);
+#endif
     }
-    return 0;
+    return 0; /* not -1 ? */
 }
 
 /*
@@ -376,8 +614,14 @@
 hip_decode1_headers(hip_t hip, unsigned char *buffer,
                      size_t len, short pcm_l[], short pcm_r[], mp3data_struct * mp3data)
 {
+#ifdef HAVE_MPG123
+    return hip123_decode1( hip, buffer, len,
+        (unsigned char*)pcm_l, (unsigned char*)pcm_r,
+        NULL, NULL, mp3data, 0 );
+#else
     int     enc_delay, enc_padding;
     return hip_decode1_headersB(hip, buffer, len, pcm_l, pcm_r, mp3data, &enc_delay, &enc_padding);
+#endif
 }
 
 
@@ -384,8 +628,14 @@
 int
 hip_decode1(hip_t hip, unsigned char *buffer, size_t len, short pcm_l[], short pcm_r[])
 {
+#ifdef HAVE_MPG123
+    return hip123_decode1( hip, buffer, len,
+        (unsigned char*)pcm_l, (unsigned char*)pcm_r,
+        NULL, NULL, NULL, 0 );
+#else
     mp3data_struct mp3data;
     return hip_decode1_headers(hip, buffer, len, pcm_l, pcm_r, &mp3data);
+#endif
 }
 
 
@@ -432,11 +682,17 @@
                       short pcm_l[], short pcm_r[], mp3data_struct * mp3data,
                       int *enc_delay, int *enc_padding)
 {
-    static char out[OUTSIZE_CLIPPED];
     if (hip) {
+#ifdef HAVE_MPG123
+        return hip123_decode1( hip, buffer, len,
+            (unsigned char*)pcm_l, (unsigned char*)pcm_r,
+            enc_delay, enc_padding, mp3data, 0);
+#else
+        static char out[OUTSIZE_CLIPPED];
         return decode1_headersB_clipchoice(hip, buffer, len, (char *) pcm_l, (char *) pcm_r, mp3data,
                                            enc_delay, enc_padding, out, OUTSIZE_CLIPPED,
                                            sizeof(short), decodeMP3);
+#endif
     }
     return -1;
 }
@@ -446,30 +702,85 @@
 {
     if (hip) {
         hip->pinfo = pinfo;
+#ifdef HAVE_MPG123
+        mpg123_set_moreinfo(hip->mh, &hip->mi);
+#endif
     }
 }
 
+void hip_finish_pinfo(hip_t hip)
+{
+#ifndef NOANALYSIS
+#ifdef HAVE_MPG123
+    struct mpg123_frameinfo fi;
+    long rate;
+    plotting_data *pinfo = hip->pinfo;
+    if(!hip || !hip->pinfo)
+        return;
 
+    /* TODO: convert to pointers to avoid copies. Allocation should be
+       on mpg123 side (in form of the struct definition), as that is
+       the writing side. */
+    memcpy(pinfo->mpg123xr, hip->mi.xr, sizeof(pinfo->mpg123xr));
+    memcpy(pinfo->sfb, hip->mi.sfb, sizeof(pinfo->sfb));
+    memcpy(pinfo->sfb_s, hip->mi.sfb_s, sizeof(pinfo->sfb_s));
+    memcpy(pinfo->qss, hip->mi.qss, sizeof(pinfo->qss));
+    memcpy(pinfo->big_values, hip->mi.big_values, sizeof(pinfo->big_values));
+    memcpy(pinfo->sub_gain, hip->mi.sub_gain, sizeof(pinfo->sub_gain));
+    memcpy(pinfo->scalefac_scale, hip->mi.scalefac_scale, sizeof(pinfo->scalefac_scale));
+    memcpy(pinfo->preflag, hip->mi.preflag, sizeof(pinfo->preflag));
+    memcpy(pinfo->mpg123blocktype, hip->mi.blocktype, sizeof(pinfo->mpg123blocktype));
+    memcpy(pinfo->mixed, hip->mi.mixed, sizeof(pinfo->mixed));
+    memcpy(pinfo->mainbits, hip->mi.mainbits, sizeof(pinfo->mainbits));
+    memcpy(pinfo->sfbits, hip->mi.sfbits, sizeof(pinfo->sfbits));
+    memcpy(pinfo->scfsi, hip->mi.scfsi, sizeof(pinfo->scfsi));
+    pinfo->maindata = hip->mi.maindata;
+    pinfo->padding  = hip->mi.padding;
+    if(MPG123_OK == mpg123_info(hip->mh, &fi)) {
+        pinfo->js = (fi.mode == MPG123_M_JOINT);
+        pinfo->stereo = fi.mode == MPG123_M_MONO ? 1 : 2;
+        pinfo->crc = fi.flags & MPG123_CRC ? 1 : 0;
+        pinfo->emph = fi.emphasis;
+        pinfo->sampfreq = fi.rate;
+        pinfo->bitrate = fi.bitrate;
+        pinfo->ms_stereo = pinfo->js ? (fi.mode_ext & 0x2)>>1 : 0;
+        pinfo->i_stereo  = pinfo->js ? (fi.mode_ext & 0x1)    : 0;
+    }
+#endif
+#endif
+}
 
 void hip_set_errorf(hip_t hip, lame_report_function func)
 {
+#ifdef HAVE_MPG123
+    /* TODO: implement something */
+#else
     if (hip) {
         hip->report_err = func;
     }
+#endif
 }
 
 void hip_set_debugf(hip_t hip, lame_report_function func)
 {
+#ifdef HAVE_MPG123
+    /* TODO: implement something */
+#else
     if (hip) {
         hip->report_dbg = func;
     }
+#endif
 }
 
 void hip_set_msgf  (hip_t hip, lame_report_function func)
 {
+#ifdef HAVE_MPG123
+    /* TODO: implement something */
+#else
     if (hip) {
         hip->report_msg = func;
     }
+#endif
 }
 
 #endif

Modified: trunk/lame/libmp3lame/util.h
===================================================================
--- trunk/lame/libmp3lame/util.h	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/libmp3lame/util.h	2020-07-11 10:22:15 UTC (rev 6462)
@@ -609,6 +609,7 @@
     int     is_lame_internal_flags_valid(const lame_internal_flags * gfp);
     
     extern void hip_set_pinfo(hip_t hip, plotting_data* pinfo);
+    extern void hip_finish_pinfo(hip_t hip);
 
 #ifdef __cplusplus
 }

Modified: trunk/lame/mpglib/Makefile.am
===================================================================
--- trunk/lame/mpglib/Makefile.am	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/mpglib/Makefile.am	2020-07-11 10:22:15 UTC (rev 6462)
@@ -3,6 +3,8 @@
 include $(top_srcdir)/Makefile.am.global
 
 INCLUDES = @INCLUDES@ -I$(top_srcdir)/libmp3lame -I$(top_builddir)
+# Avoid -I. which obscures libmpg123's mpg123.h
+DEFAULT_INCLUDES =
 
 EXTRA_DIST = \
 	AUTHORS \
@@ -10,6 +12,7 @@
 
 DEFS = @DEFS@ @CONFIG_DEFS@
 
+if LIB_WITH_DECODER
 noinst_LTLIBRARIES = libmpgdecoder.la
 
 libmpgdecoder_la_SOURCES = common.c \
@@ -20,6 +23,16 @@
 	layer2.c \
 	layer3.c \
 	tabinit.c
+else
+EXTRA_DIST += common.c \
+	dct64_i386.c \
+	decode_i386.c \
+	interface.c \
+	layer1.c \
+	layer2.c \
+	layer3.c \
+	tabinit.c
+endif
 
 noinst_HEADERS = common.h \
 	dct64_i386.h \

Modified: trunk/lame/mpglib/common.h
===================================================================
--- trunk/lame/mpglib/common.h	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/mpglib/common.h	2020-07-11 10:22:15 UTC (rev 6462)
@@ -23,7 +23,7 @@
 #ifndef COMMON_H_INCLUDED
 #define COMMON_H_INCLUDED
 
-#include "mpg123.h"
+#include "mpglib/mpg123.h"
 #include "mpglib.h"
 
 extern const int tabsel_123[2][3][16];

Modified: trunk/lame/mpglib/mpglib.h
===================================================================
--- trunk/lame/mpglib/mpglib.h	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/mpglib/mpglib.h	2020-07-11 10:22:15 UTC (rev 6462)
@@ -21,8 +21,22 @@
 #ifndef _MPGLIB_H_
 #define _MPGLIB_H_
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "lame.h"
 
+#ifdef HAVE_MPG123
+#include <mpg123.h>
+#ifndef MPG123_API_VERSION
+#error "Seems like you got the wrong mpg123 header. No MPG123_API_VERSION defined."
+#endif
+#if (MPG123_API_VERSION < 45)
+#error "Need mpg123 API >= 45."
+#endif
+#endif
+
 #ifndef plotting_data_defined
 #define plotting_data_defined
 struct plotting_data;
@@ -32,6 +46,7 @@
 
 extern void lame_report_fnc(lame_report_function f, const char *format, ...);
 
+#ifdef HAVE_MPGLIB
 struct buf {
     unsigned char *pnt;
     long    size;
@@ -47,7 +62,13 @@
     struct frame *prev;
 };
 
+#endif
+
 typedef struct mpstr_tag {
+#ifdef HAVE_MPG123
+    mpg123_handle *mh;
+    struct mpg123_moreinfo mi;
+#else
     struct buf *head, *tail; /* buffer linked list pointers, tail points to oldest buffer */
     int     vbr_header;      /* 1 if valid Xing vbr header detected */
     int     num_frames;      /* set if vbr header present */
@@ -79,6 +100,7 @@
 
     int     bitindex;
     unsigned char *wordpointer;
+#endif
     plotting_data *pinfo;
 
     lame_report_function report_msg;
@@ -86,11 +108,11 @@
     lame_report_function report_err;
 } MPSTR, *PMPSTR;
 
-
+#ifdef HAVE_MPGLIB
 #define MP3_ERR -1
 #define MP3_OK  0
 #define MP3_NEED_MORE 1
+#endif
 
 
-
 #endif /* _MPGLIB_H_ */

Modified: trunk/lame/mpglib/tabinit.c
===================================================================
--- trunk/lame/mpglib/tabinit.c	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/mpglib/tabinit.c	2020-07-11 10:22:15 UTC (rev 6462)
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include "tabinit.h"
-#include "mpg123.h"
+#include "mpglib/mpg123.h"
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>

Modified: trunk/lame/mpglib/tabinit.h
===================================================================
--- trunk/lame/mpglib/tabinit.h	2020-05-08 16:02:01 UTC (rev 6461)
+++ trunk/lame/mpglib/tabinit.h	2020-07-11 10:22:15 UTC (rev 6462)
@@ -22,7 +22,7 @@
 #ifndef MPGLIB_TABINIT_H_INCLUDED
 #define MPGLIB_TABINIT_H_INCLUDED
 
-#include "mpg123.h"
+#include "mpglib/mpg123.h"
 
 extern real decwin[512 + 32];
 extern real *pnts[5];

[Lame-cvs] SF.net SVN: lame:[6461] trunk/lame/doc/html/history.html

[<ale...@us...>]

Revision: 6461
          http://sourceforge.net/p/lame/svn/6461
Author:   aleidinger
Date:     2020-05-08 16:02:01 +0000 (Fri, 08 May 2020)
Log Message:
-----------
Add recent changes.

Modified Paths:
--------------
    trunk/lame/doc/html/history.html

Modified: trunk/lame/doc/html/history.html
===================================================================
--- trunk/lame/doc/html/history.html	2020-05-08 15:33:17 UTC (rev 6460)
+++ trunk/lame/doc/html/history.html	2020-05-08 16:02:01 UTC (rev 6461)
@@ -41,6 +41,22 @@
                     </li>
                 </ul>
             </li>
+            <li>
+                Alexander Leidinger
+                <ul>
+                    <li><font color="#3366ff">Add faster CRC routine. The speed improvement is very small for typical use cases, but may be valuable if a lot of independent encodes are running and/or for a very long time. Patch by Robert Kausch of the fre:ac project.
+                        </font>
+                    </li>
+                    <li><font color="#3366ff">Fix configure script glob-ranges matching of compiler versions. This may result in faster code if no compiler optimization flags are specified during the configure step. This is part of patch ticket <i>[ #491 ] lame 3.100 slower than 3.99.5</i>
+                        </font>
+                    </li>
+                    <li><font color="#3366ff">Disable Takehiros IEEE753 hack by default. On modern CPUs (anything more recent from AMD than hammer/k8; Intel: Core2, i3/5/7/9 and similar -- no idea about recent Atom/Pentium) it is a speed pessimization. Add a configure option for it so that it can be enabled on old CPUs.
+                        </font>
+                    </li>
+                    <li>Update to more recent autotools based scripts, this may or may not fix issues during the configure stage for less popular or more recent OS or architectures.
+                    </li>
+                </ul>
+            </li>
         </ul>
         <br>
         <h3>LAME 3.100 &nbsp;October 13 2017</h3>
@@ -3248,4 +3264,4 @@
             </p>
         </center>
     </body>
-</html>
\ No newline at end of file
+</html>

[Lame-cvs] SF.net SVN: lame:[6460] trunk/lame/configure

[<ale...@us...>]

Revision: 6460
          http://sourceforge.net/p/lame/svn/6460
Author:   aleidinger
Date:     2020-05-08 15:33:17 +0000 (Fri, 08 May 2020)
Log Message:
-----------
regen

Modified Paths:
--------------
    trunk/lame/configure

Modified: trunk/lame/configure
===================================================================
--- trunk/lame/configure	2020-05-08 15:32:58 UTC (rev 6459)
+++ trunk/lame/configure	2020-05-08 15:33:17 UTC (rev 6460)
@@ -807,6 +807,7 @@
 with_dmalloc
 enable_largefile
 enable_nasm
+enable_ieeehack
 enable_rpath
 with_libiconv_prefix
 enable_cpml
@@ -1472,21 +1473,22 @@
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-largefile     omit support for large files
-  --enable-nasm              Allow the use of nasm if available
+  --enable-nasm           Allow the use of nasm if available
+  --enable-ieeehack       Enable Takhiros IEEE754 hack (speed improvement for old CPUs)
   --disable-rpath         do not hardcode runtime library paths
-  --disable-cpml              Do not use Compaq's fast Math Library
+  --disable-cpml          Do not use Compaq's fast Math Library
   --disable-gtktest       Do not try to compile and run a test GTK program
-  --enable-efence            Use ElectricFence for malloc debugging
-  --disable-analyzer-hooks   Exclude analyzer hooks
-  --disable-decoder          Exclude mpg123 decoder
-  --disable-frontend         Do not build the lame executable default=build
-  --enable-mp3x              Build GTK frame analyzer default=no
-  --enable-mp3rtp            Build mp3rtp default=no
+  --enable-efence         Use ElectricFence for malloc debugging
+  --disable-analyzer-hooks Exclude analyzer hooks
+  --disable-decoder       Exclude mpg123 decoder
+  --disable-frontend      Do not build the lame executable default=build
+  --enable-mp3x           Build GTK frame analyzer default=no
+  --enable-mp3rtp         Build mp3rtp default=no
   --enable-dynamic-frontends Link frontends against shared libraries default=no
-  --enable-expopt=full,norm  Whether to enable experimental optimizations
-                             default=no
-  --enable-debug=alot,norm   Enable debugging (disables optimizations)
-                             default=no
+  --enable-expopt=full,norm Whether to enable experimental optimizations
+                            default=no
+  --enable-debug=alot,norm Enable debugging (disables optimizations)
+                           default=no
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1505,9 +1507,9 @@
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
-  --with-fileio=lame         Use lame's internal file io routines default
-               =sndfile      Use Erik de Castro Lopo's libsndfile
-                             (no stdin possible currently)
+  --with-fileio=lame      Use lame's internal file io routines default
+               =sndfile   Use Erik de Castro Lopo's libsndfile
+                          (no stdin possible currently)
 
 Some influential environment variables:
   CC          C compiler command
@@ -15057,7 +15059,27 @@
 fi
 
 
+# Check whether --enable-ieeehack was given.
+if test "${enable_ieeehack+set}" = set; then :
+  enableval=$enable_ieeehack; IEEE754_HACK="yes"
+else
+  IEEE754_HACK="no"
+fi
 
+case ${IEEE754_HACK} in
+	yes)
+
+$as_echo "#define TAKEHIRO_IEEE754_HACK 1" >>confdefs.h
+
+		;;
+	no)
+
+$as_echo "#define TAKEHIRO_IEEE754_HACK 0" >>confdefs.h
+
+		;;
+esac
+
+
 for ac_header in termcap.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "termcap.h" "ac_cv_header_termcap_h" "$ac_includes_default"
@@ -17663,9 +17685,6 @@
 	fi
 
 
-$as_echo "#define TAKEHIRO_IEEE754_HACK 1" >>confdefs.h
-
-
 $as_echo "#define USE_FAST_LOG 1" >>confdefs.h
 
 	;;
@@ -17676,11 +17695,7 @@
 		WITH_VECTOR=yes
 	fi
 
-	# use internal knowledge of the IEEE 754 layout
 
-$as_echo "#define TAKEHIRO_IEEE754_HACK 1" >>confdefs.h
-
-
 $as_echo "#define USE_FAST_LOG 1" >>confdefs.h
 
 	;;
@@ -17687,11 +17702,6 @@
 powerpc)
 	CPUTYPE="no"
 
-	# use internal knowledge of the IEEE 754 layout
-
-$as_echo "#define TAKEHIRO_IEEE754_HACK 1" >>confdefs.h
-
-
 	# The following should not get enabled on a G5. HOWTO check for a G5?
 
 $as_echo "#define USE_FAST_LOG 1" >>confdefs.h

[Lame-cvs] SF.net SVN: lame:[6459] trunk/lame/configure.in

[<ale...@us...>]

Revision: 6459
          http://sourceforge.net/p/lame/svn/6459
Author:   aleidinger
Date:     2020-05-08 15:32:58 +0000 (Fri, 08 May 2020)
Log Message:
-----------
Disable Takehiros IEEE hack by default, add an option for
not so modern CPU architectures to enable it.

While I'm here, make some whitespace fixes in user visible
parts of the --help option.

Modified Paths:
--------------
    trunk/lame/configure.in

Modified: trunk/lame/configure.in
===================================================================
--- trunk/lame/configure.in	2020-05-07 07:51:30 UTC (rev 6458)
+++ trunk/lame/configure.in	2020-05-08 15:32:58 UTC (rev 6459)
@@ -411,9 +411,21 @@
 RM_F="rm -f"
 
 AC_ARG_ENABLE(nasm,
-  [  --enable-nasm              Allow the use of nasm if available],
+  [  --enable-nasm           Allow the use of nasm if available],
   ASM_FOR_ARCH="i386", ASM_FOR_ARCH="")
 
+AC_ARG_ENABLE(ieeehack,
+  [  --enable-ieeehack       Enable Takhiros IEEE754 hack (speed improvement for old CPUs)],
+  IEEE754_HACK="yes", IEEE754_HACK="no")
+case ${IEEE754_HACK} in
+	yes)
+		AC_DEFINE(TAKEHIRO_IEEE754_HACK, 1, IEEE754 compatible machine)
+		;;
+	no)
+		AC_DEFINE(TAKEHIRO_IEEE754_HACK, 0, IEEE754 compatible machine)
+		;;
+esac
+
 dnl Checks for libraries.
 
 AC_CHECK_HEADERS(termcap.h)
@@ -431,7 +443,7 @@
 AC_CHECK_LIB(ffm, cos, USE_LIBM="-lffm -lm")
 dnl Compaq fast math library.
 AC_ARG_ENABLE(cpml,
-  [  --disable-cpml              Do not use Compaq's fast Math Library],
+  [  --disable-cpml          Do not use Compaq's fast Math Library],
   CONFIG_CPML="no", CONFIG_CPML="yes")
 if test "${CONFIG_CPML}" = yes; then
       AC_CHECK_LIB(cpml, cos, USE_LIBM="-lcpml")
@@ -445,7 +457,7 @@
 dnl ElectricFence malloc debugging
 AC_MSG_CHECKING(use of ElectricFence malloc debugging)
 AC_ARG_ENABLE(efence,
-  [  --enable-efence            Use ElectricFence for malloc debugging],
+  [  --enable-efence         Use ElectricFence for malloc debugging],
   CONFIG_EFENCE="${enableval}", CONFIG_EFENCE="no")
 
 case "${CONFIG_EFENCE}" in
@@ -471,9 +483,9 @@
 dnl libsndfile
 WARNING=
 AC_ARG_WITH(fileio,
-  [  --with-fileio=lame         Use lame's internal file io routines [default]]
-  [             =sndfile      Use Erik de Castro Lopo's libsndfile]
-  [                           (no stdin possible currently)],
+  [  --with-fileio=lame      Use lame's internal file io routines [default]]
+  [             =sndfile   Use Erik de Castro Lopo's libsndfile]
+  [                        (no stdin possible currently)],
   CONFIG_FILEIO="${withval}", CONFIG_FILEIO="lame")
 
 if test "${CONFIG_FILEIO}" = "sndfile" ; then
@@ -516,7 +528,7 @@
 dnl default library must include these hooks
 AC_MSG_CHECKING(use of analyzer hooks)
 AC_ARG_ENABLE(analyzer-hooks,
-  [  --disable-analyzer-hooks   Exclude analyzer hooks],
+  [  --disable-analyzer-hooks Exclude analyzer hooks],
   CONFIG_ANALYZER="${enableval}", CONFIG_ANALYZER="yes")
 
 case "${CONFIG_ANALYZER}" in
@@ -535,7 +547,7 @@
 dnl mpg123 decoder
 AC_MSG_CHECKING(use of mpg123 decoder)
 AC_ARG_ENABLE(decoder,
-  [  --disable-decoder          Exclude mpg123 decoder],
+  [  --disable-decoder       Exclude mpg123 decoder],
   CONFIG_DECODER="${enableval}", CONFIG_DECODER="yes")
 
 AM_CONDITIONAL(LIB_WITH_DECODER, test "x${CONFIG_DECODER}" = "xyes")
@@ -550,7 +562,7 @@
 
 AC_MSG_CHECKING(if the lame frontend should be build)
 AC_ARG_ENABLE(frontend,
-  [  --disable-frontend         Do not build the lame executable [default=build]],
+  [  --disable-frontend      Do not build the lame executable [default=build]],
     WITH_FRONTEND="${enableval}", WITH_FRONTEND=yes)
 if test "x${WITH_FRONTEND}" = "xyes"; then
 	WITH_FRONTEND=lame${ac_exeext}
@@ -564,7 +576,7 @@
 
 AC_MSG_CHECKING(if mp3x is requested)
 AC_ARG_ENABLE(mp3x,
-  [  --enable-mp3x              Build GTK frame analyzer [default=no]],
+  [  --enable-mp3x           Build GTK frame analyzer [default=no]],
     WITH_MP3X="${enableval}", WITH_MP3X=no)
 if test "x${WITH_MP3X}" = "xyes"; then
 	WITH_MP3X=mp3x${ac_exeext}
@@ -587,7 +599,7 @@
 
 AC_MSG_CHECKING(if mp3rtp is requested)
 AC_ARG_ENABLE(mp3rtp,
-  [  --enable-mp3rtp            Build mp3rtp [default=no]],
+  [  --enable-mp3rtp         Build mp3rtp [default=no]],
     WITH_MP3RTP="${enableval}", WITH_MP3RTP=no)
 if test "x${WITH_MP3RTP}" = "xyes"; then
 	if test ${SOCKETFUNCTION} = NO; then
@@ -687,9 +699,7 @@
 		WITH_VECTOR=yes
 	fi
 
-	AC_DEFINE(TAKEHIRO_IEEE754_HACK, 1, IEEE754 compatible machine)
-	AC_DEFINE(USE_FAST_LOG, 1, faster log implementation with less but enoug
-h precission)
+	AC_DEFINE(USE_FAST_LOG, 1, faster log implementation with less but enough precission)
 	;;
 *86)
 	CPUTYPE="i386"
@@ -698,16 +708,11 @@
 		WITH_VECTOR=yes
 	fi
 
-	# use internal knowledge of the IEEE 754 layout
-	AC_DEFINE(TAKEHIRO_IEEE754_HACK, 1, IEEE754 compatible machine)
 	AC_DEFINE(USE_FAST_LOG, 1, faster log implementation with less but enough precission)
 	;;
 powerpc)
 	CPUTYPE="no"
 
-	# use internal knowledge of the IEEE 754 layout
-	AC_DEFINE(TAKEHIRO_IEEE754_HACK, 1, IEEE754 compatible machine)
-
 	# The following should not get enabled on a G5. HOWTO check for a G5?
 	AC_DEFINE(USE_FAST_LOG, 1, faster log implementation with less but enough precission)
 	;;
@@ -782,8 +787,8 @@
 #
 AC_MSG_CHECKING(for additional optimizations)
 AC_ARG_ENABLE(expopt,
-  [  --enable-expopt=full,norm  Whether to enable experimental optimizations]
-  [                           [default=no]],
+  [  --enable-expopt=full,norm Whether to enable experimental optimizations]
+  [                          [default=no]],
     CONFIG_EXPOPT="${enableval}", CONFIG_EXPOPT="no")
 
 if test "x$HAVE_GCC" = "xyes" -o "x$HAVE_CLANG" = "xyes"; then
@@ -1011,8 +1016,8 @@
 
 AC_MSG_CHECKING(for debug options)
 AC_ARG_ENABLE(debug,
-  [  --enable-debug=alot,norm   Enable debugging (disables optimizations)]
-  [                           [default=no]],
+  [  --enable-debug=alot,norm Enable debugging (disables optimizations)]
+  [                         [default=no]],
     CONFIG_DEBUG="${enableval}", CONFIG_DEBUG="no")
 
 if test "x$GCC" = "xyes"; then

[Lame-cvs] SF.net SVN: lame:[6458] trunk/lame/libmp3lame/Makefile.in

[<ale...@us...>]

Revision: 6458
          http://sourceforge.net/p/lame/svn/6458
Author:   aleidinger
Date:     2020-05-07 07:51:30 +0000 (Thu, 07 May 2020)
Log Message:
-----------
regen

Modified Paths:
--------------
    trunk/lame/libmp3lame/Makefile.in

Modified: trunk/lame/libmp3lame/Makefile.in
===================================================================
--- trunk/lame/libmp3lame/Makefile.in	2020-05-07 07:51:01 UTC (rev 6457)
+++ trunk/lame/libmp3lame/Makefile.in	2020-05-07 07:51:30 UTC (rev 6458)
@@ -454,6 +454,7 @@
 
 noinst_HEADERS = \
 	VbrTag.h \
+	VbrTagCrc.h \
 	bitstream.h \
 	encoder.h \
 	fft.h \

[Lame-cvs] SF.net SVN: lame:[6457] trunk/lame/libmp3lame

[<ale...@us...>]

Revision: 6457
          http://sourceforge.net/p/lame/svn/6457
Author:   aleidinger
Date:     2020-05-07 07:51:01 +0000 (Thu, 07 May 2020)
Log Message:
-----------
Faster CRC calculation by Robert Kausch from the fre:ac project
(https://freac.org/developer-blog-mainmenu-9/14-freac/277-fastcrc).

The gain here is small, but measurable. If you encode multiple
independent streams at once and if there are not small (not just
a few minutes of play time), you may notice a difference.

Modified Paths:
--------------
    trunk/lame/libmp3lame/Makefile.am
    trunk/lame/libmp3lame/VbrTag.c

Added Paths:
-----------
    trunk/lame/libmp3lame/VbrTagCrc.h

Modified: trunk/lame/libmp3lame/Makefile.am
===================================================================
--- trunk/lame/libmp3lame/Makefile.am	2020-05-06 13:17:45 UTC (rev 6456)
+++ trunk/lame/libmp3lame/Makefile.am	2020-05-07 07:51:01 UTC (rev 6457)
@@ -58,6 +58,7 @@
 
 noinst_HEADERS= \
 	VbrTag.h \
+	VbrTagCrc.h \
 	bitstream.h \
 	encoder.h \
 	fft.h \

Modified: trunk/lame/libmp3lame/VbrTag.c
===================================================================
--- trunk/lame/libmp3lame/VbrTag.c	2020-05-06 13:17:45 UTC (rev 6456)
+++ trunk/lame/libmp3lame/VbrTag.c	2020-05-07 07:51:01 UTC (rev 6457)
@@ -77,40 +77,7 @@
  * See 'CRC_update_lookup'
  * Uses the polynomial x^16+x^15+x^2+1 */
 
-static const unsigned int crc16_lookup[256] = {
-    0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
-    0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
-    0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
-    0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
-    0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
-    0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
-    0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
-    0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
-    0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
-    0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
-    0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
-    0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
-    0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
-    0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
-    0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
-    0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
-    0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
-    0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
-    0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
-    0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
-    0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
-    0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
-    0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
-    0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
-    0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
-    0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
-    0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
-    0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
-    0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
-    0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
-    0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
-    0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
-};
+#include "VbrTagCrc.h"
 
 
 
@@ -580,11 +547,21 @@
 
 /* fast CRC-16 computation - uses table crc16_lookup 8*/
 static uint16_t
-CRC_update_lookup(uint16_t value, uint16_t crc)
+CRC_update_lookup(uint16_t crc, unsigned char const *buffer, int size)
 {
-    uint16_t tmp;
-    tmp = crc ^ value;
-    crc = (crc >> 8) ^ crc16_lookup[tmp & 0xff];
+    while (size >= 8) {
+        crc ^= buffer[1] << 8 | buffer[0];
+ 
+        crc = crc16_lookup[7][crc & 0xFF] ^ crc16_lookup[6][crc >> 8 ] ^
+              crc16_lookup[5][buffer[2] ] ^ crc16_lookup[4][buffer[3]] ^
+              crc16_lookup[3][buffer[4] ] ^ crc16_lookup[2][buffer[5]] ^
+              crc16_lookup[1][buffer[6] ] ^ crc16_lookup[0][buffer[7]];
+
+        buffer += 8;
+        size -= 8;
+    }
+
+    while (size--) crc = (crc >> 8) ^ crc16_lookup[0][(crc & 0xff) ^ *buffer++];
     return crc;
 }
 
@@ -591,9 +568,7 @@
 void
 UpdateMusicCRC(uint16_t * crc, unsigned char const *buffer, int size)
 {
-    int     i;
-    for (i = 0; i < size; ++i)
-        *crc = CRC_update_lookup(buffer[i], *crc);
+    *crc = CRC_update_lookup(*crc, buffer, size);
 }
 
 
@@ -852,8 +827,7 @@
     /*Calculate tag CRC.... must be done here, since it includes
      *previous information*/
 
-    for (i = 0; i < nBytesWritten; i++)
-        crc = CRC_update_lookup(pbtStreamBuffer[i], crc);
+    crc = CRC_update_lookup(crc, pbtStreamBuffer, nBytesWritten);
 
     CreateI2(&pbtStreamBuffer[nBytesWritten], crc);
     nBytesWritten += 2;
@@ -1000,9 +974,7 @@
     {
         /*work out CRC so far: initially crc = 0 */
         uint16_t crc = 0x00;
-        unsigned int i;
-        for (i = 0; i < nStreamIndex; i++)
-            crc = CRC_update_lookup(buffer[i], crc);
+        crc = CRC_update_lookup(crc, buffer, nStreamIndex);
         /*Put LAME VBR info */
         nStreamIndex += PutLameVBR(gfp, stream_size, buffer + nStreamIndex, crc);
     }

Added: trunk/lame/libmp3lame/VbrTagCrc.h
===================================================================
--- trunk/lame/libmp3lame/VbrTagCrc.h	                        (rev 0)
+++ trunk/lame/libmp3lame/VbrTagCrc.h	2020-05-07 07:51:01 UTC (rev 6457)
@@ -0,0 +1,331 @@
+/*
+ *      CRC table for VBR tags
+ *
+ *      Copyright (c) 2018 Robert Kausch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* $Id: crctable.h,v 1.1 2018/04/27 22:12:11 enzo Exp $ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "machine.h"
+
+static const uint16_t crc16_lookup[8][256] = {
+  { 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
+    0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
+    0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
+    0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
+    0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
+    0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
+    0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
+    0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
+    0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+    0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
+    0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
+    0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
+    0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
+    0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
+    0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
+    0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
+    0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
+    0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+    0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
+    0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
+    0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
+    0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
+    0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
+    0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
+    0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
+    0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
+    0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+    0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
+    0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
+    0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
+    0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
+    0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 },
+
+  { 0x0000, 0x9001, 0x6001, 0xF000, 0xC002, 0x5003, 0xA003, 0x3002,
+    0xC007, 0x5006, 0xA006, 0x3007, 0x0005, 0x9004, 0x6004, 0xF005,
+    0xC00D, 0x500C, 0xA00C, 0x300D, 0x000F, 0x900E, 0x600E, 0xF00F,
+    0x000A, 0x900B, 0x600B, 0xF00A, 0xC008, 0x5009, 0xA009, 0x3008,
+    0xC019, 0x5018, 0xA018, 0x3019, 0x001B, 0x901A, 0x601A, 0xF01B,
+    0x001E, 0x901F, 0x601F, 0xF01E, 0xC01C, 0x501D, 0xA01D, 0x301C,
+    0x0014, 0x9015, 0x6015, 0xF014, 0xC016, 0x5017, 0xA017, 0x3016,
+    0xC013, 0x5012, 0xA012, 0x3013, 0x0011, 0x9010, 0x6010, 0xF011,
+    0xC031, 0x5030, 0xA030, 0x3031, 0x0033, 0x9032, 0x6032, 0xF033,
+    0x0036, 0x9037, 0x6037, 0xF036, 0xC034, 0x5035, 0xA035, 0x3034,
+    0x003C, 0x903D, 0x603D, 0xF03C, 0xC03E, 0x503F, 0xA03F, 0x303E,
+    0xC03B, 0x503A, 0xA03A, 0x303B, 0x0039, 0x9038, 0x6038, 0xF039,
+    0x0028, 0x9029, 0x6029, 0xF028, 0xC02A, 0x502B, 0xA02B, 0x302A,
+    0xC02F, 0x502E, 0xA02E, 0x302F, 0x002D, 0x902C, 0x602C, 0xF02D,
+    0xC025, 0x5024, 0xA024, 0x3025, 0x0027, 0x9026, 0x6026, 0xF027,
+    0x0022, 0x9023, 0x6023, 0xF022, 0xC020, 0x5021, 0xA021, 0x3020,
+    0xC061, 0x5060, 0xA060, 0x3061, 0x0063, 0x9062, 0x6062, 0xF063,
+    0x0066, 0x9067, 0x6067, 0xF066, 0xC064, 0x5065, 0xA065, 0x3064,
+    0x006C, 0x906D, 0x606D, 0xF06C, 0xC06E, 0x506F, 0xA06F, 0x306E,
+    0xC06B, 0x506A, 0xA06A, 0x306B, 0x0069, 0x9068, 0x6068, 0xF069,
+    0x0078, 0x9079, 0x6079, 0xF078, 0xC07A, 0x507B, 0xA07B, 0x307A,
+    0xC07F, 0x507E, 0xA07E, 0x307F, 0x007D, 0x907C, 0x607C, 0xF07D,
+    0xC075, 0x5074, 0xA074, 0x3075, 0x0077, 0x9076, 0x6076, 0xF077,
+    0x0072, 0x9073, 0x6073, 0xF072, 0xC070, 0x5071, 0xA071, 0x3070,
+    0x0050, 0x9051, 0x6051, 0xF050, 0xC052, 0x5053, 0xA053, 0x3052,
+    0xC057, 0x5056, 0xA056, 0x3057, 0x0055, 0x9054, 0x6054, 0xF055,
+    0xC05D, 0x505C, 0xA05C, 0x305D, 0x005F, 0x905E, 0x605E, 0xF05F,
+    0x005A, 0x905B, 0x605B, 0xF05A, 0xC058, 0x5059, 0xA059, 0x3058,
+    0xC049, 0x5048, 0xA048, 0x3049, 0x004B, 0x904A, 0x604A, 0xF04B,
+    0x004E, 0x904F, 0x604F, 0xF04E, 0xC04C, 0x504D, 0xA04D, 0x304C,
+    0x0044, 0x9045, 0x6045, 0xF044, 0xC046, 0x5047, 0xA047, 0x3046,
+    0xC043, 0x5042, 0xA042, 0x3043, 0x0041, 0x9040, 0x6040, 0xF041 },
+
+  { 0x0000, 0xC051, 0xC0A1, 0x00F0, 0xC141, 0x0110, 0x01E0, 0xC1B1,
+    0xC281, 0x02D0, 0x0220, 0xC271, 0x03C0, 0xC391, 0xC361, 0x0330,
+    0xC501, 0x0550, 0x05A0, 0xC5F1, 0x0440, 0xC411, 0xC4E1, 0x04B0,
+    0x0780, 0xC7D1, 0xC721, 0x0770, 0xC6C1, 0x0690, 0x0660, 0xC631,
+    0xCA01, 0x0A50, 0x0AA0, 0xCAF1, 0x0B40, 0xCB11, 0xCBE1, 0x0BB0,
+    0x0880, 0xC8D1, 0xC821, 0x0870, 0xC9C1, 0x0990, 0x0960, 0xC931,
+    0x0F00, 0xCF51, 0xCFA1, 0x0FF0, 0xCE41, 0x0E10, 0x0EE0, 0xCEB1,
+    0xCD81, 0x0DD0, 0x0D20, 0xCD71, 0x0CC0, 0xCC91, 0xCC61, 0x0C30,
+    0xD401, 0x1450, 0x14A0, 0xD4F1, 0x1540, 0xD511, 0xD5E1, 0x15B0,
+    0x1680, 0xD6D1, 0xD621, 0x1670, 0xD7C1, 0x1790, 0x1760, 0xD731,
+    0x1100, 0xD151, 0xD1A1, 0x11F0, 0xD041, 0x1010, 0x10E0, 0xD0B1,
+    0xD381, 0x13D0, 0x1320, 0xD371, 0x12C0, 0xD291, 0xD261, 0x1230,
+    0x1E00, 0xDE51, 0xDEA1, 0x1EF0, 0xDF41, 0x1F10, 0x1FE0, 0xDFB1,
+    0xDC81, 0x1CD0, 0x1C20, 0xDC71, 0x1DC0, 0xDD91, 0xDD61, 0x1D30,
+    0xDB01, 0x1B50, 0x1BA0, 0xDBF1, 0x1A40, 0xDA11, 0xDAE1, 0x1AB0,
+    0x1980, 0xD9D1, 0xD921, 0x1970, 0xD8C1, 0x1890, 0x1860, 0xD831,
+    0xE801, 0x2850, 0x28A0, 0xE8F1, 0x2940, 0xE911, 0xE9E1, 0x29B0,
+    0x2A80, 0xEAD1, 0xEA21, 0x2A70, 0xEBC1, 0x2B90, 0x2B60, 0xEB31,
+    0x2D00, 0xED51, 0xEDA1, 0x2DF0, 0xEC41, 0x2C10, 0x2CE0, 0xECB1,
+    0xEF81, 0x2FD0, 0x2F20, 0xEF71, 0x2EC0, 0xEE91, 0xEE61, 0x2E30,
+    0x2200, 0xE251, 0xE2A1, 0x22F0, 0xE341, 0x2310, 0x23E0, 0xE3B1,
+    0xE081, 0x20D0, 0x2020, 0xE071, 0x21C0, 0xE191, 0xE161, 0x2130,
+    0xE701, 0x2750, 0x27A0, 0xE7F1, 0x2640, 0xE611, 0xE6E1, 0x26B0,
+    0x2580, 0xE5D1, 0xE521, 0x2570, 0xE4C1, 0x2490, 0x2460, 0xE431,
+    0x3C00, 0xFC51, 0xFCA1, 0x3CF0, 0xFD41, 0x3D10, 0x3DE0, 0xFDB1,
+    0xFE81, 0x3ED0, 0x3E20, 0xFE71, 0x3FC0, 0xFF91, 0xFF61, 0x3F30,
+    0xF901, 0x3950, 0x39A0, 0xF9F1, 0x3840, 0xF811, 0xF8E1, 0x38B0,
+    0x3B80, 0xFBD1, 0xFB21, 0x3B70, 0xFAC1, 0x3A90, 0x3A60, 0xFA31,
+    0xF601, 0x3650, 0x36A0, 0xF6F1, 0x3740, 0xF711, 0xF7E1, 0x37B0,
+    0x3480, 0xF4D1, 0xF421, 0x3470, 0xF5C1, 0x3590, 0x3560, 0xF531,
+    0x3300, 0xF351, 0xF3A1, 0x33F0, 0xF241, 0x3210, 0x32E0, 0xF2B1,
+    0xF181, 0x31D0, 0x3120, 0xF171, 0x30C0, 0xF091, 0xF061, 0x3030 },
+
+  { 0x0000, 0xFC01, 0xB801, 0x4400, 0x3001, 0xCC00, 0x8800, 0x7401,
+    0x6002, 0x9C03, 0xD803, 0x2402, 0x5003, 0xAC02, 0xE802, 0x1403,
+    0xC004, 0x3C05, 0x7805, 0x8404, 0xF005, 0x0C04, 0x4804, 0xB405,
+    0xA006, 0x5C07, 0x1807, 0xE406, 0x9007, 0x6C06, 0x2806, 0xD407,
+    0xC00B, 0x3C0A, 0x780A, 0x840B, 0xF00A, 0x0C0B, 0x480B, 0xB40A,
+    0xA009, 0x5C08, 0x1808, 0xE409, 0x9008, 0x6C09, 0x2809, 0xD408,
+    0x000F, 0xFC0E, 0xB80E, 0x440F, 0x300E, 0xCC0F, 0x880F, 0x740E,
+    0x600D, 0x9C0C, 0xD80C, 0x240D, 0x500C, 0xAC0D, 0xE80D, 0x140C,
+    0xC015, 0x3C14, 0x7814, 0x8415, 0xF014, 0x0C15, 0x4815, 0xB414,
+    0xA017, 0x5C16, 0x1816, 0xE417, 0x9016, 0x6C17, 0x2817, 0xD416,
+    0x0011, 0xFC10, 0xB810, 0x4411, 0x3010, 0xCC11, 0x8811, 0x7410,
+    0x6013, 0x9C12, 0xD812, 0x2413, 0x5012, 0xAC13, 0xE813, 0x1412,
+    0x001E, 0xFC1F, 0xB81F, 0x441E, 0x301F, 0xCC1E, 0x881E, 0x741F,
+    0x601C, 0x9C1D, 0xD81D, 0x241C, 0x501D, 0xAC1C, 0xE81C, 0x141D,
+    0xC01A, 0x3C1B, 0x781B, 0x841A, 0xF01B, 0x0C1A, 0x481A, 0xB41B,
+    0xA018, 0x5C19, 0x1819, 0xE418, 0x9019, 0x6C18, 0x2818, 0xD419,
+    0xC029, 0x3C28, 0x7828, 0x8429, 0xF028, 0x0C29, 0x4829, 0xB428,
+    0xA02B, 0x5C2A, 0x182A, 0xE42B, 0x902A, 0x6C2B, 0x282B, 0xD42A,
+    0x002D, 0xFC2C, 0xB82C, 0x442D, 0x302C, 0xCC2D, 0x882D, 0x742C,
+    0x602F, 0x9C2E, 0xD82E, 0x242F, 0x502E, 0xAC2F, 0xE82F, 0x142E,
+    0x0022, 0xFC23, 0xB823, 0x4422, 0x3023, 0xCC22, 0x8822, 0x7423,
+    0x6020, 0x9C21, 0xD821, 0x2420, 0x5021, 0xAC20, 0xE820, 0x1421,
+    0xC026, 0x3C27, 0x7827, 0x8426, 0xF027, 0x0C26, 0x4826, 0xB427,
+    0xA024, 0x5C25, 0x1825, 0xE424, 0x9025, 0x6C24, 0x2824, 0xD425,
+    0x003C, 0xFC3D, 0xB83D, 0x443C, 0x303D, 0xCC3C, 0x883C, 0x743D,
+    0x603E, 0x9C3F, 0xD83F, 0x243E, 0x503F, 0xAC3E, 0xE83E, 0x143F,
+    0xC038, 0x3C39, 0x7839, 0x8438, 0xF039, 0x0C38, 0x4838, 0xB439,
+    0xA03A, 0x5C3B, 0x183B, 0xE43A, 0x903B, 0x6C3A, 0x283A, 0xD43B,
+    0xC037, 0x3C36, 0x7836, 0x8437, 0xF036, 0x0C37, 0x4837, 0xB436,
+    0xA035, 0x5C34, 0x1834, 0xE435, 0x9034, 0x6C35, 0x2835, 0xD434,
+    0x0033, 0xFC32, 0xB832, 0x4433, 0x3032, 0xCC33, 0x8833, 0x7432,
+    0x6031, 0x9C30, 0xD830, 0x2431, 0x5030, 0xAC31, 0xE831, 0x1430 },
+
+  { 0x0000, 0xC03D, 0xC079, 0x0044, 0xC0F1, 0x00CC, 0x0088, 0xC0B5,
+    0xC1E1, 0x01DC, 0x0198, 0xC1A5, 0x0110, 0xC12D, 0xC169, 0x0154,
+    0xC3C1, 0x03FC, 0x03B8, 0xC385, 0x0330, 0xC30D, 0xC349, 0x0374,
+    0x0220, 0xC21D, 0xC259, 0x0264, 0xC2D1, 0x02EC, 0x02A8, 0xC295,
+    0xC781, 0x07BC, 0x07F8, 0xC7C5, 0x0770, 0xC74D, 0xC709, 0x0734,
+    0x0660, 0xC65D, 0xC619, 0x0624, 0xC691, 0x06AC, 0x06E8, 0xC6D5,
+    0x0440, 0xC47D, 0xC439, 0x0404, 0xC4B1, 0x048C, 0x04C8, 0xC4F5,
+    0xC5A1, 0x059C, 0x05D8, 0xC5E5, 0x0550, 0xC56D, 0xC529, 0x0514,
+    0xCF01, 0x0F3C, 0x0F78, 0xCF45, 0x0FF0, 0xCFCD, 0xCF89, 0x0FB4,
+    0x0EE0, 0xCEDD, 0xCE99, 0x0EA4, 0xCE11, 0x0E2C, 0x0E68, 0xCE55,
+    0x0CC0, 0xCCFD, 0xCCB9, 0x0C84, 0xCC31, 0x0C0C, 0x0C48, 0xCC75,
+    0xCD21, 0x0D1C, 0x0D58, 0xCD65, 0x0DD0, 0xCDED, 0xCDA9, 0x0D94,
+    0x0880, 0xC8BD, 0xC8F9, 0x08C4, 0xC871, 0x084C, 0x0808, 0xC835,
+    0xC961, 0x095C, 0x0918, 0xC925, 0x0990, 0xC9AD, 0xC9E9, 0x09D4,
+    0xCB41, 0x0B7C, 0x0B38, 0xCB05, 0x0BB0, 0xCB8D, 0xCBC9, 0x0BF4,
+    0x0AA0, 0xCA9D, 0xCAD9, 0x0AE4, 0xCA51, 0x0A6C, 0x0A28, 0xCA15,
+    0xDE01, 0x1E3C, 0x1E78, 0xDE45, 0x1EF0, 0xDECD, 0xDE89, 0x1EB4,
+    0x1FE0, 0xDFDD, 0xDF99, 0x1FA4, 0xDF11, 0x1F2C, 0x1F68, 0xDF55,
+    0x1DC0, 0xDDFD, 0xDDB9, 0x1D84, 0xDD31, 0x1D0C, 0x1D48, 0xDD75,
+    0xDC21, 0x1C1C, 0x1C58, 0xDC65, 0x1CD0, 0xDCED, 0xDCA9, 0x1C94,
+    0x1980, 0xD9BD, 0xD9F9, 0x19C4, 0xD971, 0x194C, 0x1908, 0xD935,
+    0xD861, 0x185C, 0x1818, 0xD825, 0x1890, 0xD8AD, 0xD8E9, 0x18D4,
+    0xDA41, 0x1A7C, 0x1A38, 0xDA05, 0x1AB0, 0xDA8D, 0xDAC9, 0x1AF4,
+    0x1BA0, 0xDB9D, 0xDBD9, 0x1BE4, 0xDB51, 0x1B6C, 0x1B28, 0xDB15,
+    0x1100, 0xD13D, 0xD179, 0x1144, 0xD1F1, 0x11CC, 0x1188, 0xD1B5,
+    0xD0E1, 0x10DC, 0x1098, 0xD0A5, 0x1010, 0xD02D, 0xD069, 0x1054,
+    0xD2C1, 0x12FC, 0x12B8, 0xD285, 0x1230, 0xD20D, 0xD249, 0x1274,
+    0x1320, 0xD31D, 0xD359, 0x1364, 0xD3D1, 0x13EC, 0x13A8, 0xD395,
+    0xD681, 0x16BC, 0x16F8, 0xD6C5, 0x1670, 0xD64D, 0xD609, 0x1634,
+    0x1760, 0xD75D, 0xD719, 0x1724, 0xD791, 0x17AC, 0x17E8, 0xD7D5,
+    0x1540, 0xD57D, 0xD539, 0x1504, 0xD5B1, 0x158C, 0x15C8, 0xD5F5,
+    0xD4A1, 0x149C, 0x14D8, 0xD4E5, 0x1450, 0xD46D, 0xD429, 0x1414 },
+
+  { 0x0000, 0xD101, 0xE201, 0x3300, 0x8401, 0x5500, 0x6600, 0xB701,
+    0x4801, 0x9900, 0xAA00, 0x7B01, 0xCC00, 0x1D01, 0x2E01, 0xFF00,
+    0x9002, 0x4103, 0x7203, 0xA302, 0x1403, 0xC502, 0xF602, 0x2703,
+    0xD803, 0x0902, 0x3A02, 0xEB03, 0x5C02, 0x8D03, 0xBE03, 0x6F02,
+    0x6007, 0xB106, 0x8206, 0x5307, 0xE406, 0x3507, 0x0607, 0xD706,
+    0x2806, 0xF907, 0xCA07, 0x1B06, 0xAC07, 0x7D06, 0x4E06, 0x9F07,
+    0xF005, 0x2104, 0x1204, 0xC305, 0x7404, 0xA505, 0x9605, 0x4704,
+    0xB804, 0x6905, 0x5A05, 0x8B04, 0x3C05, 0xED04, 0xDE04, 0x0F05,
+    0xC00E, 0x110F, 0x220F, 0xF30E, 0x440F, 0x950E, 0xA60E, 0x770F,
+    0x880F, 0x590E, 0x6A0E, 0xBB0F, 0x0C0E, 0xDD0F, 0xEE0F, 0x3F0E,
+    0x500C, 0x810D, 0xB20D, 0x630C, 0xD40D, 0x050C, 0x360C, 0xE70D,
+    0x180D, 0xC90C, 0xFA0C, 0x2B0D, 0x9C0C, 0x4D0D, 0x7E0D, 0xAF0C,
+    0xA009, 0x7108, 0x4208, 0x9309, 0x2408, 0xF509, 0xC609, 0x1708,
+    0xE808, 0x3909, 0x0A09, 0xDB08, 0x6C09, 0xBD08, 0x8E08, 0x5F09,
+    0x300B, 0xE10A, 0xD20A, 0x030B, 0xB40A, 0x650B, 0x560B, 0x870A,
+    0x780A, 0xA90B, 0x9A0B, 0x4B0A, 0xFC0B, 0x2D0A, 0x1E0A, 0xCF0B,
+    0xC01F, 0x111E, 0x221E, 0xF31F, 0x441E, 0x951F, 0xA61F, 0x771E,
+    0x881E, 0x591F, 0x6A1F, 0xBB1E, 0x0C1F, 0xDD1E, 0xEE1E, 0x3F1F,
+    0x501D, 0x811C, 0xB21C, 0x631D, 0xD41C, 0x051D, 0x361D, 0xE71C,
+    0x181C, 0xC91D, 0xFA1D, 0x2B1C, 0x9C1D, 0x4D1C, 0x7E1C, 0xAF1D,
+    0xA018, 0x7119, 0x4219, 0x9318, 0x2419, 0xF518, 0xC618, 0x1719,
+    0xE819, 0x3918, 0x0A18, 0xDB19, 0x6C18, 0xBD19, 0x8E19, 0x5F18,
+    0x301A, 0xE11B, 0xD21B, 0x031A, 0xB41B, 0x651A, 0x561A, 0x871B,
+    0x781B, 0xA91A, 0x9A1A, 0x4B1B, 0xFC1A, 0x2D1B, 0x1E1B, 0xCF1A,
+    0x0011, 0xD110, 0xE210, 0x3311, 0x8410, 0x5511, 0x6611, 0xB710,
+    0x4810, 0x9911, 0xAA11, 0x7B10, 0xCC11, 0x1D10, 0x2E10, 0xFF11,
+    0x9013, 0x4112, 0x7212, 0xA313, 0x1412, 0xC513, 0xF613, 0x2712,
+    0xD812, 0x0913, 0x3A13, 0xEB12, 0x5C13, 0x8D12, 0xBE12, 0x6F13,
+    0x6016, 0xB117, 0x8217, 0x5316, 0xE417, 0x3516, 0x0616, 0xD717,
+    0x2817, 0xF916, 0xCA16, 0x1B17, 0xAC16, 0x7D17, 0x4E17, 0x9F16,
+    0xF014, 0x2115, 0x1215, 0xC314, 0x7415, 0xA514, 0x9614, 0x4715,
+    0xB815, 0x6914, 0x5A14, 0x8B15, 0x3C14, 0xED15, 0xDE15, 0x0F14 },
+
+  { 0x0000, 0xC010, 0xC023, 0x0033, 0xC045, 0x0055, 0x0066, 0xC076,
+    0xC089, 0x0099, 0x00AA, 0xC0BA, 0x00CC, 0xC0DC, 0xC0EF, 0x00FF,
+    0xC111, 0x0101, 0x0132, 0xC122, 0x0154, 0xC144, 0xC177, 0x0167,
+    0x0198, 0xC188, 0xC1BB, 0x01AB, 0xC1DD, 0x01CD, 0x01FE, 0xC1EE,
+    0xC221, 0x0231, 0x0202, 0xC212, 0x0264, 0xC274, 0xC247, 0x0257,
+    0x02A8, 0xC2B8, 0xC28B, 0x029B, 0xC2ED, 0x02FD, 0x02CE, 0xC2DE,
+    0x0330, 0xC320, 0xC313, 0x0303, 0xC375, 0x0365, 0x0356, 0xC346,
+    0xC3B9, 0x03A9, 0x039A, 0xC38A, 0x03FC, 0xC3EC, 0xC3DF, 0x03CF,
+    0xC441, 0x0451, 0x0462, 0xC472, 0x0404, 0xC414, 0xC427, 0x0437,
+    0x04C8, 0xC4D8, 0xC4EB, 0x04FB, 0xC48D, 0x049D, 0x04AE, 0xC4BE,
+    0x0550, 0xC540, 0xC573, 0x0563, 0xC515, 0x0505, 0x0536, 0xC526,
+    0xC5D9, 0x05C9, 0x05FA, 0xC5EA, 0x059C, 0xC58C, 0xC5BF, 0x05AF,
+    0x0660, 0xC670, 0xC643, 0x0653, 0xC625, 0x0635, 0x0606, 0xC616,
+    0xC6E9, 0x06F9, 0x06CA, 0xC6DA, 0x06AC, 0xC6BC, 0xC68F, 0x069F,
+    0xC771, 0x0761, 0x0752, 0xC742, 0x0734, 0xC724, 0xC717, 0x0707,
+    0x07F8, 0xC7E8, 0xC7DB, 0x07CB, 0xC7BD, 0x07AD, 0x079E, 0xC78E,
+    0xC881, 0x0891, 0x08A2, 0xC8B2, 0x08C4, 0xC8D4, 0xC8E7, 0x08F7,
+    0x0808, 0xC818, 0xC82B, 0x083B, 0xC84D, 0x085D, 0x086E, 0xC87E,
+    0x0990, 0xC980, 0xC9B3, 0x09A3, 0xC9D5, 0x09C5, 0x09F6, 0xC9E6,
+    0xC919, 0x0909, 0x093A, 0xC92A, 0x095C, 0xC94C, 0xC97F, 0x096F,
+    0x0AA0, 0xCAB0, 0xCA83, 0x0A93, 0xCAE5, 0x0AF5, 0x0AC6, 0xCAD6,
+    0xCA29, 0x0A39, 0x0A0A, 0xCA1A, 0x0A6C, 0xCA7C, 0xCA4F, 0x0A5F,
+    0xCBB1, 0x0BA1, 0x0B92, 0xCB82, 0x0BF4, 0xCBE4, 0xCBD7, 0x0BC7,
+    0x0B38, 0xCB28, 0xCB1B, 0x0B0B, 0xCB7D, 0x0B6D, 0x0B5E, 0xCB4E,
+    0x0CC0, 0xCCD0, 0xCCE3, 0x0CF3, 0xCC85, 0x0C95, 0x0CA6, 0xCCB6,
+    0xCC49, 0x0C59, 0x0C6A, 0xCC7A, 0x0C0C, 0xCC1C, 0xCC2F, 0x0C3F,
+    0xCDD1, 0x0DC1, 0x0DF2, 0xCDE2, 0x0D94, 0xCD84, 0xCDB7, 0x0DA7,
+    0x0D58, 0xCD48, 0xCD7B, 0x0D6B, 0xCD1D, 0x0D0D, 0x0D3E, 0xCD2E,
+    0xCEE1, 0x0EF1, 0x0EC2, 0xCED2, 0x0EA4, 0xCEB4, 0xCE87, 0x0E97,
+    0x0E68, 0xCE78, 0xCE4B, 0x0E5B, 0xCE2D, 0x0E3D, 0x0E0E, 0xCE1E,
+    0x0FF0, 0xCFE0, 0xCFD3, 0x0FC3, 0xCFB5, 0x0FA5, 0x0F96, 0xCF86,
+    0xCF79, 0x0F69, 0x0F5A, 0xCF4A, 0x0F3C, 0xCF2C, 0xCF1F, 0x0F0F },
+
+  { 0x0000, 0xCCC1, 0xD981, 0x1540, 0xF301, 0x3FC0, 0x2A80, 0xE641,
+    0xA601, 0x6AC0, 0x7F80, 0xB341, 0x5500, 0x99C1, 0x8C81, 0x4040,
+    0x0C01, 0xC0C0, 0xD580, 0x1941, 0xFF00, 0x33C1, 0x2681, 0xEA40,
+    0xAA00, 0x66C1, 0x7381, 0xBF40, 0x5901, 0x95C0, 0x8080, 0x4C41,
+    0x1802, 0xD4C3, 0xC183, 0x0D42, 0xEB03, 0x27C2, 0x3282, 0xFE43,
+    0xBE03, 0x72C2, 0x6782, 0xAB43, 0x4D02, 0x81C3, 0x9483, 0x5842,
+    0x1403, 0xD8C2, 0xCD82, 0x0143, 0xE702, 0x2BC3, 0x3E83, 0xF242,
+    0xB202, 0x7EC3, 0x6B83, 0xA742, 0x4103, 0x8DC2, 0x9882, 0x5443,
+    0x3004, 0xFCC5, 0xE985, 0x2544, 0xC305, 0x0FC4, 0x1A84, 0xD645,
+    0x9605, 0x5AC4, 0x4F84, 0x8345, 0x6504, 0xA9C5, 0xBC85, 0x7044,
+    0x3C05, 0xF0C4, 0xE584, 0x2945, 0xCF04, 0x03C5, 0x1685, 0xDA44,
+    0x9A04, 0x56C5, 0x4385, 0x8F44, 0x6905, 0xA5C4, 0xB084, 0x7C45,
+    0x2806, 0xE4C7, 0xF187, 0x3D46, 0xDB07, 0x17C6, 0x0286, 0xCE47,
+    0x8E07, 0x42C6, 0x5786, 0x9B47, 0x7D06, 0xB1C7, 0xA487, 0x6846,
+    0x2407, 0xE8C6, 0xFD86, 0x3147, 0xD706, 0x1BC7, 0x0E87, 0xC246,
+    0x8206, 0x4EC7, 0x5B87, 0x9746, 0x7107, 0xBDC6, 0xA886, 0x6447,
+    0x6008, 0xACC9, 0xB989, 0x7548, 0x9309, 0x5FC8, 0x4A88, 0x8649,
+    0xC609, 0x0AC8, 0x1F88, 0xD349, 0x3508, 0xF9C9, 0xEC89, 0x2048,
+    0x6C09, 0xA0C8, 0xB588, 0x7949, 0x9F08, 0x53C9, 0x4689, 0x8A48,
+    0xCA08, 0x06C9, 0x1389, 0xDF48, 0x3909, 0xF5C8, 0xE088, 0x2C49,
+    0x780A, 0xB4CB, 0xA18B, 0x6D4A, 0x8B0B, 0x47CA, 0x528A, 0x9E4B,
+    0xDE0B, 0x12CA, 0x078A, 0xCB4B, 0x2D0A, 0xE1CB, 0xF48B, 0x384A,
+    0x740B, 0xB8CA, 0xAD8A, 0x614B, 0x870A, 0x4BCB, 0x5E8B, 0x924A,
+    0xD20A, 0x1ECB, 0x0B8B, 0xC74A, 0x210B, 0xEDCA, 0xF88A, 0x344B,
+    0x500C, 0x9CCD, 0x898D, 0x454C, 0xA30D, 0x6FCC, 0x7A8C, 0xB64D,
+    0xF60D, 0x3ACC, 0x2F8C, 0xE34D, 0x050C, 0xC9CD, 0xDC8D, 0x104C,
+    0x5C0D, 0x90CC, 0x858C, 0x494D, 0xAF0C, 0x63CD, 0x768D, 0xBA4C,
+    0xFA0C, 0x36CD, 0x238D, 0xEF4C, 0x090D, 0xC5CC, 0xD08C, 0x1C4D,
+    0x480E, 0x84CF, 0x918F, 0x5D4E, 0xBB0F, 0x77CE, 0x628E, 0xAE4F,
+    0xEE0F, 0x22CE, 0x378E, 0xFB4F, 0x1D0E, 0xD1CF, 0xC48F, 0x084E,
+    0x440F, 0x88CE, 0x9D8E, 0x514F, 0xB70E, 0x7BCF, 0x6E8F, 0xA24E,
+    0xE20E, 0x2ECF, 0x3B8F, 0xF74E, 0x110F, 0xDDCE, 0xC88E, 0x044F }
+};
+
+#if 0
+static uint16_t
+reflect_crc(uint16_t ref, char ch)
+{
+    int i;
+    uint16_t value;
+    value = 0;
+
+    for (i = 1; i < (ch + 1); ++i) {
+        if (ref & 1) value |= 1 << (ch - i);
+        ref >>= 1;
+    }
+    return value;
+}
+
+static void
+init_crc()
+{
+    int i, j;
+    uint16_t polynomial, crc;
+    polynomial = 0x8005;
+
+    for (i = 0; i <= 0xFF; ++i) {
+        crc = reflect_crc(i, 8) << 8;
+
+        for (j = 0; j < 8; ++j)
+            crc = (crc << 1) ^ (crc & (1 << 15) ? polynomial : 0);
+
+        crc16_lookup[0][i] = reflect_crc(crc, 16);
+    }
+
+    for (i = 0; i <= 0xFF; ++i)
+        for (j = 1; j < 8; ++j)
+            crc16_lookup[j][i] = crc16_lookup[0][crc16_lookup[j - 1][i] & 0xFF] ^ (crc16_lookup[j - 1][i] >> 8);
+}
+#endif


Property changes on: trunk/lame/libmp3lame/VbrTagCrc.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property