modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r20136 - in trunk/OpenMPT/include/mpg123: . src src/include src/libmpg123

[<sv...@op...>]

Author: manx
Date: Sat Feb 17 16:59:48 2024
New Revision: 20136
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20136

Log:
[Var] mpg123: Update to 1.32.5 (2024-02-17).

Modified:
   trunk/OpenMPT/include/mpg123/OpenMPT.txt
   trunk/OpenMPT/include/mpg123/src/include/mpg123.h
   trunk/OpenMPT/include/mpg123/src/libmpg123/getcpuflags_arm.c
   trunk/OpenMPT/include/mpg123/src/libmpg123/layer3.c
   trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c
   trunk/OpenMPT/include/mpg123/src/version.h

Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt
==============================================================================
--- trunk/OpenMPT/include/mpg123/OpenMPT.txt	Fri Feb 16 14:57:54 2024	(r20135)
+++ trunk/OpenMPT/include/mpg123/OpenMPT.txt	Sat Feb 17 16:59:48 2024	(r20136)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.4 (2024-01-08).
+libmpg123 library version 1.32.5 (2024-02-17).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.

Modified: trunk/OpenMPT/include/mpg123/src/include/mpg123.h
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/include/mpg123.h	Fri Feb 16 14:57:54 2024	(r20135)
+++ trunk/OpenMPT/include/mpg123/src/include/mpg123.h	Sat Feb 17 16:59:48 2024	(r20136)
@@ -1327,7 +1327,7 @@
 
 /** Adjust output volume including the RVA setting by chosen amount
  *  \param mh handle
- *  \param change volume adjustment in decibels (limited to +/- 60 dB)
+ *  \param db volume adjustment in decibels (limited to +/- 60 dB)
  *  \return MPG123_OK on success
  */
 MPG123_EXPORT int mpg123_volume_change_db(mpg123_handle *mh, double db);

Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/getcpuflags_arm.c
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/libmpg123/getcpuflags_arm.c	Fri Feb 16 14:57:54 2024	(r20135)
+++ trunk/OpenMPT/include/mpg123/src/libmpg123/getcpuflags_arm.c	Sat Feb 17 16:59:48 2024	(r20136)
@@ -1,11 +1,17 @@
 /*
 	getcpuflags_arm: get cpuflags for ARM
 
-	copyright 1995-2014 by the mpg123 project - free software under the terms of the LGPL 2.1
+	copyright 1995-2024 by the mpg123 project - free software under the terms of the LGPL 2.1
 	see COPYING and AUTHORS files in distribution or http://mpg123.org
 	initially written by Taihei Momma
 */
 
+// For sigsetjmp, we need POSIX 2001
+#define _POSIX_C_SOURCE 200112L
+// For SA_RESTART, XSI is needed (or POSIX 2008).
+// This here should include the above, keeping that for clarity.
+#define _XOPEN_SOURCE 600
+
 #include <setjmp.h>
 #include <signal.h>
 #include "mpg123lib_intern.h"

Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/layer3.c
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/libmpg123/layer3.c	Fri Feb 16 14:57:54 2024	(r20135)
+++ trunk/OpenMPT/include/mpg123/src/libmpg123/layer3.c	Sat Feb 17 16:59:48 2024	(r20136)
@@ -1466,7 +1466,7 @@
 #define DCT36_WRAP(asmfunc) \
 static void asmfunc ## _wrap(real *inbuf,real *o1,real *o2,const real *wintab,real *tsbuf) \
 { \
-	return asmfunc(inbuf, o1, o2, wintab, tsbuf); \
+	asmfunc(inbuf, o1, o2, wintab, tsbuf); \
 }
 
 #ifdef OPT_SSE
@@ -1529,22 +1529,22 @@
 #endif
 #ifdef OPT_AVX
 	case avx:
-		fr->cpu_opts.the_dct36 = INT123_dct36_avx;
+		fr->cpu_opts.the_dct36 = INT123_dct36_avx_wrap;
 	break;
 #endif
 #ifdef OPT_X86_64
 	case x86_64:
-		fr->cpu_opts.the_dct36 = INT123_dct36_x86_64;
+		fr->cpu_opts.the_dct36 = INT123_dct36_x86_64_wrap;
 	break;
 #endif
 #ifdef OPT_NEON
 	case neon:
-		fr->cpu_opts.the_dct36 = INT123_dct36_neon;
+		fr->cpu_opts.the_dct36 = INT123_dct36_neon_wrap;
 	break;
 #endif
 #ifdef OPT_NEON64
 	case neon:
-		fr->cpu_opts.the_dct36 = INT123_dct36_neon64;
+		fr->cpu_opts.the_dct36 = INT123_dct36_neon64_wrap;
 	break;
 #endif
 	default:

Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c	Fri Feb 16 14:57:54 2024	(r20135)
+++ trunk/OpenMPT/include/mpg123/src/libmpg123/libmpg123.c	Sat Feb 17 16:59:48 2024	(r20136)
@@ -648,9 +648,10 @@
 #ifndef PORTABLE_API
 	ret = INT123_wrap_open( mh, iohandle, NULL, -1
 	,	mh->p.timeout, mh->p.flags & MPG123_QUIET );
+	iohandle = ret == LFS_WRAP_NONE ? iohandle : mh->wrapperdata;
 	if(ret >= 0)
 #endif
-		ret = INT123_open_stream_handle(mh, ret == LFS_WRAP_NONE ? iohandle : mh->wrapperdata);
+		ret = INT123_open_stream_handle(mh, iohandle);
 	return ret;
 }
 

Modified: trunk/OpenMPT/include/mpg123/src/version.h
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/version.h	Fri Feb 16 14:57:54 2024	(r20135)
+++ trunk/OpenMPT/include/mpg123/src/version.h	Sat Feb 17 16:59:48 2024	(r20136)
@@ -16,7 +16,7 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 4
+#define MPG123_PATCH 5
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
 #define MPG123_SUFFIX ""

[OMPT-svn-commit] OpenMPT r20135 - in branches/OpenMPT-1.30: . mptrack src/mpt/osinfo src/openmpt/sounddevice

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 14:57:54 2024
New Revision: 20135
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20135

Log:
Merged revision(s) 20133 from trunk/OpenMPT:
[Fix] mpt/osinfo/class.hpp: Avoid clashing with BSD macro on FreeBSD. Fixes <https://forum.openmpt.org/index.php?msg=50150>.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/mptrack/MPTrackWine.cpp
   branches/OpenMPT-1.30/src/mpt/osinfo/class.hpp
   branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceManager.cpp
   branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDevicePortAudio.cpp
   branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp

Modified: branches/OpenMPT-1.30/mptrack/MPTrackWine.cpp
==============================================================================
--- branches/OpenMPT-1.30/mptrack/MPTrackWine.cpp	Fri Feb 16 14:31:54 2024	(r20134)
+++ branches/OpenMPT-1.30/mptrack/MPTrackWine.cpp	Fri Feb 16 14:57:54 2024	(r20135)
@@ -157,7 +157,7 @@
 	if(wineVersion.RawBuildID().empty()) supported = false;
 	if(!TrackerSettings::Instance().WineSupportAllowUnknownHost)
 	{
-		if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) && wineVersion.RawHostSysName() == "FreeBSD"))
+		if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) && wineVersion.RawHostSysName() == "FreeBSD"))
 		{
 			// ok
 		} else
@@ -425,7 +425,7 @@
 
 		script += std::string() + "\n";
 
-		const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "gmake" : "make");
+		const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "gmake" : "make");
 
 		std::vector<std::string> commands;
 		commands.push_back(make);
@@ -490,7 +490,7 @@
 			winegcc.push_back("winegcc64-development");
 		}
 		winegcc.push_back("winegcc-development");
-		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD)
+		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_)
 		{ // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there.
 			if constexpr(mpt::arch_bits == 32)
 			{ // 32bit winegcc probably cannot compile to 64bit
@@ -511,7 +511,7 @@
 			winegcc.push_back("winegcc64");
 		}
 		winegcc.push_back("winegcc");
-		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD)
+		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_)
 		{ // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there.
 			if constexpr(mpt::arch_bits == 32)
 			{ // 32bit winegcc probably cannot compile to 64bit
@@ -601,7 +601,7 @@
 
 			script += std::string() + "{" + "\n";
 			script += std::string() + " echo 0" + "\n";
-			script += std::string() + " " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" + "\n";
+			script += std::string() + " " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" + "\n";
 			script += std::string() + " echo -n $? > stdexit.txt" + "\n";
 			script += std::string() + " echo 100" + "\n";
 			script += std::string() + "} | " + dialog.Progress("[OK] Prepare OpenMPT Wine Integration\\n[OK] Compile native support\\n[>>] Compile Wine wrapper\\n\\n[3/3] Compiling Wine wrapper ...") + "\n";
@@ -634,7 +634,7 @@
 			script += std::string() + " " + dialog.TextBox("stderr.txt") + "\n";
 			script += std::string() + "fi" + "\n";
 		
-			script += std::string() + "" + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" + "\n";
+			script += std::string() + "" + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" + "\n";
 			script += std::string() + "if [ \"$?\" -ne \"0\" ] ; then" + "\n";
 			if(TrackerSettings::Instance().WineSupportCompileVerbosity >= 1)
 			{

Modified: branches/OpenMPT-1.30/src/mpt/osinfo/class.hpp
==============================================================================
--- branches/OpenMPT-1.30/src/mpt/osinfo/class.hpp	Fri Feb 16 14:31:54 2024	(r20134)
+++ branches/OpenMPT-1.30/src/mpt/osinfo/class.hpp	Fri Feb 16 14:57:54 2024	(r20135)
@@ -31,7 +31,7 @@
 	Windows,
 	Linux,
 	Darwin,
-	BSD,
+	BSD_,
 	Haiku,
 	DOS,
 };
@@ -47,7 +47,7 @@
 	} else if (sysname == "Darwin") {
 		result = mpt::osinfo::osclass::Darwin;
 	} else if (sysname == "FreeBSD" || sysname == "DragonFly" || sysname == "NetBSD" || sysname == "OpenBSD" || sysname == "MidnightBSD") {
-		result = mpt::osinfo::osclass::BSD;
+		result = mpt::osinfo::osclass::BSD_;
 	} else if (sysname == "Haiku") {
 		result = mpt::osinfo::osclass::Haiku;
 	} else if (sysname == "MS-DOS") {

Modified: branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceManager.cpp
==============================================================================
--- branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceManager.cpp	Fri Feb 16 14:31:54 2024	(r20134)
+++ branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceManager.cpp	Fri Feb 16 14:57:54 2024	(r20135)
@@ -227,7 +227,7 @@
 #if defined(MPT_WITH_PORTAUDIO)
 		typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paJACK)].value = Info::DefaultFor::ProAudio;
 #endif
-	} else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD)
+	} else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD_)
 	{
 #if defined(MPT_WITH_PORTAUDIO)
 		typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paOSS)].value = Info::DefaultFor::System;

Modified: branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDevicePortAudio.cpp
==============================================================================
--- branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDevicePortAudio.cpp	Fri Feb 16 14:31:54 2024	(r20134)
+++ branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDevicePortAudio.cpp	Fri Feb 16 14:57:54 2024	(r20135)
@@ -860,12 +860,12 @@
 			result.apiName = MPT_USTRING("OSS");
 			result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast<PaDeviceIndex>(dev)) ? Info::Default::Named : Info::Default::None);
 			result.flags = {
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
 				Info::Level::Primary,
 				Info::Compatible::No,
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
 				Info::Io::FullDuplex,
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
 				Info::Implementor::External
 			};
 			break;

Modified: branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp
==============================================================================
--- branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp	Fri Feb 16 14:31:54 2024	(r20134)
+++ branches/OpenMPT-1.30/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp	Fri Feb 16 14:57:54 2024	(r20135)
@@ -667,12 +667,12 @@
 					info.apiName = MPT_USTRING("OSS");
 					info.default_ = (rtinfo.isDefaultOutput ? Info::Default::Named : Info::Default::None);
 					info.flags = {
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
 						Info::Level::Secondary,
 						Info::Compatible::No,
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
 						Info::Io::FullDuplex,
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
 						Info::Implementor::External
 					};
 					break;

[OMPT-svn-commit] OpenMPT r20134 - in branches/OpenMPT-1.31: . mptrack src/mpt/osinfo src/openmpt/sounddevice

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 14:31:54 2024
New Revision: 20134
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20134

Log:
Merged revision(s) 20133 from trunk/OpenMPT:
[Fix] mpt/osinfo/class.hpp: Avoid clashing with BSD macro on FreeBSD. Fixes <https://forum.openmpt.org/index.php?msg=50150>.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/MPTrackWine.cpp
   branches/OpenMPT-1.31/src/mpt/osinfo/class.hpp
   branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceManager.cpp
   branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDevicePortAudio.cpp
   branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp

Modified: branches/OpenMPT-1.31/mptrack/MPTrackWine.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/MPTrackWine.cpp	Fri Feb 16 14:31:29 2024	(r20133)
+++ branches/OpenMPT-1.31/mptrack/MPTrackWine.cpp	Fri Feb 16 14:31:54 2024	(r20134)
@@ -157,7 +157,7 @@
 	if(wineVersion.RawBuildID().empty()) supported = false;
 	if(!TrackerSettings::Instance().WineSupportAllowUnknownHost)
 	{
-		if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) && wineVersion.RawHostSysName() == "FreeBSD"))
+		if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) && wineVersion.RawHostSysName() == "FreeBSD"))
 		{
 			// ok
 		} else
@@ -414,7 +414,7 @@
 			"missing=" "\n"
 			"\n";
 
-		const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "gmake" : "make");
+		const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "gmake" : "make");
 
 		const std::string commands[] =
 		{
@@ -479,7 +479,7 @@
 			winegcc.push_back("winegcc64-development");
 		}
 		winegcc.push_back("winegcc-development");
-		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD)
+		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_)
 		{ // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there.
 			if constexpr(mpt::arch_bits == 32)
 			{ // 32bit winegcc probably cannot compile to 64bit
@@ -500,7 +500,7 @@
 			winegcc.push_back("winegcc64");
 		}
 		winegcc.push_back("winegcc");
-		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD)
+		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_)
 		{ // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there.
 			if constexpr(mpt::arch_bits == 32)
 			{ // 32bit winegcc probably cannot compile to 64bit
@@ -597,7 +597,7 @@
 
 				"{" "\n"
 				" echo 0" "\n"
-				" " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" "\n"
+				" " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" "\n"
 				" echo -n $? > stdexit.txt" "\n"
 				" echo 100" "\n"
 				"} | " + dialog.Progress("[OK] Prepare OpenMPT Wine Integration\\n[OK] Compile native support\\n[>>] Compile Wine wrapper\\n\\n[3/3] Compiling Wine wrapper ...") + "\n"
@@ -636,7 +636,7 @@
 				"fi" "\n";
 
 			script +=
-				make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" "\n"
+				make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" "\n"
 				"if [ \"$?\" -ne \"0\" ] ; then" "\n";
 			if(TrackerSettings::Instance().WineSupportCompileVerbosity >= 1)
 			{

Modified: branches/OpenMPT-1.31/src/mpt/osinfo/class.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/osinfo/class.hpp	Fri Feb 16 14:31:29 2024	(r20133)
+++ branches/OpenMPT-1.31/src/mpt/osinfo/class.hpp	Fri Feb 16 14:31:54 2024	(r20134)
@@ -31,7 +31,7 @@
 	Windows,
 	Linux,
 	Darwin,
-	BSD,
+	BSD_,
 	Haiku,
 	DOS,
 };
@@ -47,7 +47,7 @@
 	} else if (sysname == "Darwin") {
 		result = mpt::osinfo::osclass::Darwin;
 	} else if (sysname == "FreeBSD" || sysname == "DragonFly" || sysname == "NetBSD" || sysname == "OpenBSD" || sysname == "MidnightBSD") {
-		result = mpt::osinfo::osclass::BSD;
+		result = mpt::osinfo::osclass::BSD_;
 	} else if (sysname == "Haiku") {
 		result = mpt::osinfo::osclass::Haiku;
 	} else if (sysname == "IBMPcDos" || sysname == "CompqDOS" || sysname == "MsoftDOS" || sysname == "AT&T DOS" || sysname == "ZenitDOS" || sysname == "HP DOS" || sysname == "GrBulDOS" || sysname == "PBellDOS" || sysname == "DEC DOS" || sysname == "OlivtDOS" || sysname == "TI DOS" || sysname == "Toshiba" || sysname == "NWin3Dev" || sysname == "MSWinDev" || sysname == "RxDOS" || sysname == "PTS-DOS" || sysname == "GenSoft" || sysname == "DR-DOS" || sysname == "NovelDOS" || sysname == "FreeDOS" || sysname == "MS-DOS") {
@@ -91,7 +91,7 @@
 		case mpt::osinfo::osclass::Darwin:
 			result = "Darwin";
 			break;
-		case mpt::osinfo::osclass::BSD:
+		case mpt::osinfo::osclass::BSD_:
 			result = "BSD";
 			break;
 		case mpt::osinfo::osclass::Haiku:

Modified: branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceManager.cpp
==============================================================================
--- branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceManager.cpp	Fri Feb 16 14:31:29 2024	(r20133)
+++ branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceManager.cpp	Fri Feb 16 14:31:54 2024	(r20134)
@@ -227,7 +227,7 @@
 #if defined(MPT_WITH_PORTAUDIO)
 		typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paJACK)].value = Info::DefaultFor::ProAudio;
 #endif
-	} else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD)
+	} else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD_)
 	{
 #if defined(MPT_WITH_PORTAUDIO)
 		typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paOSS)].value = Info::DefaultFor::System;

Modified: branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDevicePortAudio.cpp
==============================================================================
--- branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDevicePortAudio.cpp	Fri Feb 16 14:31:29 2024	(r20133)
+++ branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDevicePortAudio.cpp	Fri Feb 16 14:31:54 2024	(r20134)
@@ -868,12 +868,12 @@
 			result.apiName = MPT_USTRING("OSS");
 			result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast<PaDeviceIndex>(dev)) ? Info::Default::Named : Info::Default::None);
 			result.flags = {
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
 				Info::Level::Primary,
 				Info::Compatible::No,
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
 				Info::Io::FullDuplex,
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
 				Info::Implementor::External
 			};
 			break;

Modified: branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp
==============================================================================
--- branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp	Fri Feb 16 14:31:29 2024	(r20133)
+++ branches/OpenMPT-1.31/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp	Fri Feb 16 14:31:54 2024	(r20134)
@@ -668,12 +668,12 @@
 					info.apiName = MPT_USTRING("OSS");
 					info.default_ = (rtinfo.isDefaultOutput ? Info::Default::Named : Info::Default::None);
 					info.flags = {
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
 						Info::Level::Secondary,
 						Info::Compatible::No,
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
 						Info::Io::FullDuplex,
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
 						Info::Implementor::External
 					};
 					break;

[OMPT-svn-commit] OpenMPT r20133 - in trunk/OpenMPT: mptrack src/mpt/osinfo src/openmpt/sounddevice

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 14:31:29 2024
New Revision: 20133
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20133

Log:
[Fix] mpt/osinfo/class.hpp: Avoid clashing with BSD macro on FreeBSD. Fixes <https://forum.openmpt.org/index.php?msg=50150>.

Modified:
   trunk/OpenMPT/mptrack/MPTrackWine.cpp
   trunk/OpenMPT/src/mpt/osinfo/class.hpp
   trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceManager.cpp
   trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePortAudio.cpp
   trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp

Modified: trunk/OpenMPT/mptrack/MPTrackWine.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MPTrackWine.cpp	Fri Feb 16 13:10:10 2024	(r20132)
+++ trunk/OpenMPT/mptrack/MPTrackWine.cpp	Fri Feb 16 14:31:29 2024	(r20133)
@@ -158,7 +158,7 @@
 	if(wineVersion.RawBuildID().empty()) supported = false;
 	if(!TrackerSettings::Instance().WineSupportAllowUnknownHost)
 	{
-		if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) && wineVersion.RawHostSysName() == "FreeBSD"))
+		if((wineVersion.HostClass() == mpt::osinfo::osclass::Linux) || ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) && wineVersion.RawHostSysName() == "FreeBSD"))
 		{
 			// ok
 		} else
@@ -415,7 +415,7 @@
 			"missing=" "\n"
 			"\n";
 
-		const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "gmake" : "make");
+		const std::string make = ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "gmake" : "make");
 
 		const std::string commands[] =
 		{
@@ -480,7 +480,7 @@
 			winegcc.push_back("winegcc64-development");
 		}
 		winegcc.push_back("winegcc-development");
-		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD)
+		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_)
 		{ // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there.
 			if constexpr(mpt::arch_bits == 32)
 			{ // 32bit winegcc probably cannot compile to 64bit
@@ -501,7 +501,7 @@
 			winegcc.push_back("winegcc64");
 		}
 		winegcc.push_back("winegcc");
-		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD)
+		if(wineVersion.HostClass() != mpt::osinfo::osclass::BSD_)
 		{ // avoid C++ compiler on *BSD because libc++ Win32 support tends to be missing there.
 			if constexpr(mpt::arch_bits == 32)
 			{ // 32bit winegcc probably cannot compile to 64bit
@@ -598,7 +598,7 @@
 
 				"{" "\n"
 				" echo 0" "\n"
-				" " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" "\n"
+				" " + make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all MPT_PROGRESS_FILE=\"&4\" 4>&1 1>stdout.txt 2>stderr.txt" "\n"
 				" echo -n $? > stdexit.txt" "\n"
 				" echo 100" "\n"
 				"} | " + dialog.Progress("[OK] Prepare OpenMPT Wine Integration\\n[OK] Compile native support\\n[>>] Compile Wine wrapper\\n\\n[3/3] Compiling Wine wrapper ...") + "\n"
@@ -637,7 +637,7 @@
 				"fi" "\n";
 
 			script +=
-				make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" "\n"
+				make + " -j " + mpt::afmt::dec(std::max(std::thread::hardware_concurrency(), static_cast<unsigned int>(1))) + " -f build/wine/wine_wrapper.mk" + " V=" + mpt::afmt::dec(makeverbosity) + " WINEGXX=$MPT_WINEGXX " + "MPT_WINEGCC_LANG=" + ((wineVersion.HostClass() == mpt::osinfo::osclass::BSD_) ? "C" : "CPLUSPLUS") + " MPT_WINE_SEARCHPATH=" + wine.EscapePosixShell(nativeSearchPath) + " all" "\n"
 				"if [ \"$?\" -ne \"0\" ] ; then" "\n";
 			if(TrackerSettings::Instance().WineSupportCompileVerbosity >= 1)
 			{

Modified: trunk/OpenMPT/src/mpt/osinfo/class.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/osinfo/class.hpp	Fri Feb 16 13:10:10 2024	(r20132)
+++ trunk/OpenMPT/src/mpt/osinfo/class.hpp	Fri Feb 16 14:31:29 2024	(r20133)
@@ -31,7 +31,7 @@
 	Windows,
 	Linux,
 	Darwin,
-	BSD,
+	BSD_,
 	Haiku,
 	DOS,
 };
@@ -47,7 +47,7 @@
 	} else if (sysname == "Darwin") {
 		result = mpt::osinfo::osclass::Darwin;
 	} else if (sysname == "FreeBSD" || sysname == "DragonFly" || sysname == "NetBSD" || sysname == "OpenBSD" || sysname == "MidnightBSD") {
-		result = mpt::osinfo::osclass::BSD;
+		result = mpt::osinfo::osclass::BSD_;
 	} else if (sysname == "Haiku") {
 		result = mpt::osinfo::osclass::Haiku;
 	} else if (sysname == "IBMPcDos" || sysname == "CompqDOS" || sysname == "MsoftDOS" || sysname == "AT&T DOS" || sysname == "ZenitDOS" || sysname == "HP DOS" || sysname == "GrBulDOS" || sysname == "PBellDOS" || sysname == "DEC DOS" || sysname == "OlivtDOS" || sysname == "TI DOS" || sysname == "Toshiba" || sysname == "NWin3Dev" || sysname == "MSWinDev" || sysname == "RxDOS" || sysname == "PTS-DOS" || sysname == "GenSoft" || sysname == "DR-DOS" || sysname == "NovelDOS" || sysname == "FreeDOS" || sysname == "MS-DOS") {
@@ -91,7 +91,7 @@
 		case mpt::osinfo::osclass::Darwin:
 			result = "Darwin";
 			break;
-		case mpt::osinfo::osclass::BSD:
+		case mpt::osinfo::osclass::BSD_:
 			result = "BSD";
 			break;
 		case mpt::osinfo::osclass::Haiku:

Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceManager.cpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceManager.cpp	Fri Feb 16 13:10:10 2024	(r20132)
+++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceManager.cpp	Fri Feb 16 14:31:29 2024	(r20133)
@@ -227,7 +227,7 @@
 #if defined(MPT_WITH_PORTAUDIO)
 		typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paJACK)].value = Info::DefaultFor::ProAudio;
 #endif
-	} else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD)
+	} else if(GetSysInfo().SystemClass == mpt::osinfo::osclass::BSD_)
 	{
 #if defined(MPT_WITH_PORTAUDIO)
 		typeDefault[MPT_UFORMAT_MESSAGE("PortAudio-{}")(paOSS)].value = Info::DefaultFor::System;

Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePortAudio.cpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePortAudio.cpp	Fri Feb 16 13:10:10 2024	(r20132)
+++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDevicePortAudio.cpp	Fri Feb 16 14:31:29 2024	(r20133)
@@ -868,12 +868,12 @@
 			result.apiName = MPT_USTRING("OSS");
 			result.default_ = ((Pa_GetHostApiInfo(Pa_GetDeviceInfo(dev)->hostApi)->defaultOutputDevice == static_cast<PaDeviceIndex>(dev)) ? Info::Default::Named : Info::Default::None);
 			result.flags = {
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
 				Info::Level::Primary,
 				Info::Compatible::No,
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
 				Info::Io::FullDuplex,
-				sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
+				sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
 				Info::Implementor::External
 			};
 			break;

Modified: trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp
==============================================================================
--- trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp	Fri Feb 16 13:10:10 2024	(r20132)
+++ trunk/OpenMPT/src/openmpt/sounddevice/SoundDeviceRtAudio.cpp	Fri Feb 16 14:31:29 2024	(r20133)
@@ -668,12 +668,12 @@
 					info.apiName = MPT_USTRING("OSS");
 					info.default_ = (rtinfo.isDefaultOutput ? Info::Default::Named : Info::Default::None);
 					info.flags = {
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Usability::Usable : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Usability::Deprecated : Info::Usability::NotAvailable,
 						Info::Level::Secondary,
 						Info::Compatible::No,
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Api::Native : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Api::Emulated : Info::Api::Emulated,
 						Info::Io::FullDuplex,
-						sysInfo.SystemClass == mpt::osinfo::osclass::BSD ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
+						sysInfo.SystemClass == mpt::osinfo::osclass::BSD_ ? Info::Mixing::Hardware : sysInfo.SystemClass == mpt::osinfo::osclass::Linux ? Info::Mixing::Software : Info::Mixing::Software,
 						Info::Implementor::External
 					};
 					break;

[OMPT-svn-commit] OpenMPT r20132 - in branches/OpenMPT-1.30: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 13:10:10 2024
New Revision: 20132
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20132

Log:
Merged revision(s) 20130 from trunk/OpenMPT:
[Fix] build: CI: GitHub: Install doxygen on FreeBSD.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 13:09:45 2024	(r20131)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 13:10:10 2024	(r20132)
@@ -40,7 +40,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
       uses: cross-platform-actions/action@v0.22.0
       with:

Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:09:45 2024	(r20131)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:10:10 2024	(r20132)
@@ -40,7 +40,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
       uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:

[OMPT-svn-commit] OpenMPT r20131 - in branches/OpenMPT-1.31: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 13:09:45 2024
New Revision: 20131
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20131

Log:
Merged revision(s) 20130 from trunk/OpenMPT:
[Fix] build: CI: GitHub: Install doxygen on FreeBSD.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 13:09:09 2024	(r20130)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 13:09:45 2024	(r20131)
@@ -40,7 +40,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
       uses: cross-platform-actions/action@v0.22.0
       with:

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:09:09 2024	(r20130)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:09:45 2024	(r20131)
@@ -40,7 +40,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
       uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:

[OMPT-svn-commit] OpenMPT r20130 - trunk/OpenMPT/.github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 13:09:09 2024
New Revision: 20130
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20130

Log:
[Fix] build: CI: GitHub: Install doxygen on FreeBSD.

Modified:
   trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml
   trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 13:04:40 2024	(r20129)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 13:09:09 2024	(r20130)
@@ -42,7 +42,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
       uses: cross-platform-actions/action@v0.22.0
       with:

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:04:40 2024	(r20129)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:09:09 2024	(r20130)
@@ -42,7 +42,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
+          sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
       uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:

[OMPT-svn-commit] OpenMPT r20129 - in branches/OpenMPT-1.30: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 13:04:40 2024
New Revision: 20129
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20129

Log:
Merged revision(s) 20128 from branches/OpenMPT-1.31:
Merged revision(s) 20127 from trunk/OpenMPT:
[Imp] build: CI: GitHub: Add FreeBSD 14.0.
........
........

Added:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml
      - copied, changed from r20128, branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml
Modified:
   branches/OpenMPT-1.30/   (props changed)

Copied and modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml (from r20128, branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:04:04 2024	(r20128, copy source)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:04:40 2024	(r20129)
@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ OpenMPT-1.31 ]
+    branches: [ OpenMPT-1.30 ]
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}

[OMPT-svn-commit] OpenMPT r20128 - in branches/OpenMPT-1.31: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 13:04:04 2024
New Revision: 20128
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20128

Log:
Merged revision(s) 20127 from trunk/OpenMPT:
[Imp] build: CI: GitHub: Add FreeBSD 14.0.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml
      - copied, changed from r20127, trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml
Modified:
   branches/OpenMPT-1.31/   (props changed)

Copied and modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml (from r20127, trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:01:02 2024	(r20127, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:04:04 2024	(r20128)
@@ -2,9 +2,7 @@
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches: [ OpenMPT-1.31 ]
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}

[OMPT-svn-commit] OpenMPT r20127 - trunk/OpenMPT/.github/workflows

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 13:01:02 2024
New Revision: 20127
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20127

Log:
[Imp] build: CI: GitHub: Add FreeBSD 14.0.

Added:
   trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml
      - copied, changed from r20126, trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml

Copied and modified: trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml (from r20126, trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-13.2-Makefile.yml	Fri Feb 16 11:52:08 2024	(r20126, copy source)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-14.0-Makefile.yml	Fri Feb 16 13:01:02 2024	(r20127)
@@ -1,4 +1,4 @@
-name: FreeBSD 13.2 Makefile
+name: FreeBSD 14.0 Makefile
 
 on:
   push:
@@ -19,64 +19,64 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.22.0
+      uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '14.0'
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.22.0
+      uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '14.0'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.22.0
+      uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '14.0'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     - name: Test
-      uses: cross-platform-actions/action@v0.22.0
+      uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '14.0'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.22.0
+      uses: cross-platform-actions/action@c04fd7fb84e2857942df068d89ac5c27b2f3667d
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '13.2'
+        version: '14.0'
         shell: bash
         sync_files: false
         shutdown_vm: true

[OMPT-svn-commit] OpenMPT r20126 - trunk/OpenMPT/libopenmpt

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 11:52:08 2024
New Revision: 20126
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20126

Log:
[Mod] libopenmpt: Bump prerel version.

Modified:
   trunk/OpenMPT/libopenmpt/libopenmpt_version.h
   trunk/OpenMPT/libopenmpt/libopenmpt_version.mk

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_version.h
==============================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_version.h	Fri Feb 16 11:51:32 2024	(r20125)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_version.h	Fri Feb 16 11:52:08 2024	(r20126)
@@ -23,7 +23,7 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 0
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.3"
+#define OPENMPT_API_VERSION_PREREL "-pre.4"
 /*! \brief libopenmpt pre-release flag */
 #define OPENMPT_API_VERSION_IS_PREREL 1
 

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_version.mk
==============================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_version.mk	Fri Feb 16 11:51:32 2024	(r20125)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_version.mk	Fri Feb 16 11:52:08 2024	(r20126)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=8
 LIBOPENMPT_VERSION_PATCH=0
-LIBOPENMPT_VERSION_PREREL=-pre.3
+LIBOPENMPT_VERSION_PREREL=-pre.4
 
 LIBOPENMPT_LTVER_CURRENT=5
 LIBOPENMPT_LTVER_REVISION=0

[OMPT-svn-commit] OpenMPT r20125 - in trunk/OpenMPT: build/make doc/libopenmpt

[<sv...@op...>]

Author: manx
Date: Fri Feb 16 11:51:32 2024
New Revision: 20125
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20125

Log:
[Mod] build: Makefile: Emscripten: Use `--use-port=foo` instead of `-sUSE_FOO` for Emscripten 3.1.54 and later.
[Reg] build: Makefile: Emscripten: Using `EMSCRIPTEN_PORTS=1` with Emscripten older than  3.1.54 now requires additionally specifying `ANCIENT=1`.

Modified:
   trunk/OpenMPT/build/make/config-emscripten.mk
   trunk/OpenMPT/doc/libopenmpt/changelog.md

Modified: trunk/OpenMPT/build/make/config-emscripten.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-emscripten.mk	Wed Feb 14 10:33:47 2024	(r20124)
+++ trunk/OpenMPT/build/make/config-emscripten.mk	Fri Feb 16 11:51:32 2024	(r20125)
@@ -48,9 +48,15 @@
 endif
 
 ifeq ($(EMSCRIPTEN_PORTS),1)
+ifeq ($(ANCIENT),1)
 CXXFLAGS += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
 CFLAGS   += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1 -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
 LDFLAGS  += -s USE_ZLIB=1 -sUSE_MPG123=1 -sUSE_OGG=1 -sUSE_VORBIS=1
+else
+CXXFLAGS += --use-port=zlib --use-port=mpg123 --use-port=vorbis --use-port=ogg -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
+CFLAGS   += --use-port=zlib --use-port=mpg123 --use-port=vorbis --use-port=ogg -DMPT_WITH_ZLIB -DMPT_WITH_MPG123 -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_OGG
+LDFLAGS  += --use-port=zlib --use-port=mpg123 --use-port=vorbis --use-port=ogg
+endif
 NO_MINIZ=1
 NO_MINIMP3=1
 NO_STBVORBIS=1

Modified: trunk/OpenMPT/doc/libopenmpt/changelog.md
==============================================================================
--- trunk/OpenMPT/doc/libopenmpt/changelog.md	Wed Feb 14 10:33:47 2024	(r20124)
+++ trunk/OpenMPT/doc/libopenmpt/changelog.md	Fri Feb 16 11:51:32 2024	(r20125)
@@ -18,6 +18,8 @@
 
  *  [**Regression**] Support for Emscripten versions older than 3.1.51 has been
     removed.
+ *  [**Regression**] Using `EMSCRIPTEN_PORTS=1` with Emscripten older than
+    3.1.54 now requires additionally specifying `ANCIENT=1`.
 
 ### libopenmpt 0.7.0 (2023-04-30)
 

[OMPT-svn-commit] OpenMPT r20124 - in branches/OpenMPT-1.30: . src/mpt/base

[<sv...@op...>]

Author: manx
Date: Wed Feb 14 10:33:47 2024
New Revision: 20124
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20124

Log:
Merged revision(s) 20122 from trunk/OpenMPT:
[Ref] mpt/base/detect_compiler.hpp: Detect VS2022 19.9.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp

Modified: branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp
==============================================================================
--- branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp	Wed Feb 14 10:33:20 2024	(r20123)
+++ branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp	Wed Feb 14 10:33:47 2024	(r20124)
@@ -50,7 +50,9 @@
 #elif defined(_MSC_VER)
 
 #define MPT_COMPILER_MSVC 1
-#if (_MSC_VER >= 1938)
+#if (_MSC_VER >= 1939)
+#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 9)
+#elif (_MSC_VER >= 1938)
 #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 8)
 #elif (_MSC_VER >= 1937)
 #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 7)

[OMPT-svn-commit] OpenMPT r20123 - in branches/OpenMPT-1.31: . src/mpt/base

[<sv...@op...>]

Author: manx
Date: Wed Feb 14 10:33:20 2024
New Revision: 20123
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20123

Log:
Merged revision(s) 20122 from trunk/OpenMPT:
[Ref] mpt/base/detect_compiler.hpp: Detect VS2022 19.9.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp

Modified: branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp	Wed Feb 14 10:32:44 2024	(r20122)
+++ branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp	Wed Feb 14 10:33:20 2024	(r20123)
@@ -50,7 +50,9 @@
 #elif defined(_MSC_VER)
 
 #define MPT_COMPILER_MSVC 1
-#if (_MSC_VER >= 1938)
+#if (_MSC_VER >= 1939)
+#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 9)
+#elif (_MSC_VER >= 1938)
 #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 8)
 #elif (_MSC_VER >= 1937)
 #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 7)

[OMPT-svn-commit] OpenMPT r20122 - trunk/OpenMPT/src/mpt/base

[<sv...@op...>]

Author: manx
Date: Wed Feb 14 10:32:44 2024
New Revision: 20122
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20122

Log:
[Ref] mpt/base/detect_compiler.hpp: Detect VS2022 19.9.

Modified:
   trunk/OpenMPT/src/mpt/base/detect_compiler.hpp

Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Tue Feb 13 21:16:05 2024	(r20121)
+++ trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Wed Feb 14 10:32:44 2024	(r20122)
@@ -50,7 +50,9 @@
 #elif defined(_MSC_VER)
 
 #define MPT_COMPILER_MSVC 1
-#if (_MSC_VER >= 1938)
+#if (_MSC_VER >= 1939)
+#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 9)
+#elif (_MSC_VER >= 1938)
 #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 8)
 #elif (_MSC_VER >= 1937)
 #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 7)

[OMPT-svn-commit] OpenMPT r20121 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Tue Feb 13 21:16:05 2024
New Revision: 20121
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20121

Log:
Merged revision(s) 20120 from trunk/OpenMPT:
[Fix] Sample tab: Avoid single-pixel sample data selections with zoomed-out or auto-zoomed samples (quite likely introduced in r17143).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/View_smp.cpp
   branches/OpenMPT-1.31/mptrack/View_smp.h

Modified: branches/OpenMPT-1.31/mptrack/View_smp.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_smp.cpp	Tue Feb 13 21:15:01 2024	(r20120)
+++ branches/OpenMPT-1.31/mptrack/View_smp.cpp	Tue Feb 13 21:16:05 2024	(r20121)
@@ -1788,6 +1788,10 @@
 
 	if(m_dwStatus[SMPSTATUS_MOUSEDRAG])
 	{
+		if(!m_dwStatus[SMPSTATUS_MOUSEMOVED] && m_startDragPoint == point)
+			return;
+
+		m_dwStatus.set(SMPSTATUS_MOUSEMOVED);
 		const SmpLength len = sndFile.GetSample(m_nSample).nLength;
 		if(!len)
 			return;
@@ -1979,6 +1983,7 @@
 		return;
 
 	m_dwStatus.set(SMPSTATUS_MOUSEDRAG);
+	m_dwStatus.reset(SMPSTATUS_MOUSEMOVED);
 	SetFocus();
 	SetCapture();
 	bool oldsel = (m_dwBeginSel != m_dwEndSel);

Modified: branches/OpenMPT-1.31/mptrack/View_smp.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_smp.h	Tue Feb 13 21:15:01 2024	(r20120)
+++ branches/OpenMPT-1.31/mptrack/View_smp.h	Tue Feb 13 21:16:05 2024	(r20121)
@@ -26,10 +26,11 @@
 public:
 	enum Flags
 	{
-		SMPSTATUS_MOUSEDRAG		= 0x01,
-		SMPSTATUS_KEYDOWN		= 0x02,
-		SMPSTATUS_NCLBTNDOWN	= 0x04,
-		SMPSTATUS_DRAWING		= 0x08,
+		SMPSTATUS_MOUSEDRAG  = 0x01,
+		SMPSTATUS_KEYDOWN    = 0x02,
+		SMPSTATUS_NCLBTNDOWN = 0x04,
+		SMPSTATUS_DRAWING    = 0x08,
+		SMPSTATUS_MOUSEMOVED = 0x10,
 	};
 
 protected:

[OMPT-svn-commit] OpenMPT r20120 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Tue Feb 13 21:15:01 2024
New Revision: 20120
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20120

Log:
[Fix] Sample tab: Avoid single-pixel sample data selections with zoomed-out or auto-zoomed samples (quite likely introduced in r17143).

Modified:
   trunk/OpenMPT/mptrack/View_smp.cpp
   trunk/OpenMPT/mptrack/View_smp.h

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	Sun Feb 11 00:28:08 2024	(r20119)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	Tue Feb 13 21:15:01 2024	(r20120)
@@ -1789,6 +1789,10 @@
 
 	if(m_dwStatus[SMPSTATUS_MOUSEDRAG])
 	{
+		if(!m_dwStatus[SMPSTATUS_MOUSEMOVED] && m_startDragPoint == point)
+			return;
+
+		m_dwStatus.set(SMPSTATUS_MOUSEMOVED);
 		const SmpLength len = sndFile.GetSample(m_nSample).nLength;
 		if(!len)
 			return;
@@ -1980,6 +1984,7 @@
 		return;
 
 	m_dwStatus.set(SMPSTATUS_MOUSEDRAG);
+	m_dwStatus.reset(SMPSTATUS_MOUSEMOVED);
 	SetFocus();
 	SetCapture();
 	bool oldsel = (m_dwBeginSel != m_dwEndSel);

Modified: trunk/OpenMPT/mptrack/View_smp.h
==============================================================================
--- trunk/OpenMPT/mptrack/View_smp.h	Sun Feb 11 00:28:08 2024	(r20119)
+++ trunk/OpenMPT/mptrack/View_smp.h	Tue Feb 13 21:15:01 2024	(r20120)
@@ -28,10 +28,11 @@
 public:
 	enum Flags
 	{
-		SMPSTATUS_MOUSEDRAG		= 0x01,
-		SMPSTATUS_KEYDOWN		= 0x02,
-		SMPSTATUS_NCLBTNDOWN	= 0x04,
-		SMPSTATUS_DRAWING		= 0x08,
+		SMPSTATUS_MOUSEDRAG  = 0x01,
+		SMPSTATUS_KEYDOWN    = 0x02,
+		SMPSTATUS_NCLBTNDOWN = 0x04,
+		SMPSTATUS_DRAWING    = 0x08,
+		SMPSTATUS_MOUSEMOVED = 0x10,
 	};
 
 protected:

[OMPT-svn-commit] OpenMPT r20119 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Feb 11 00:28:08 2024
New Revision: 20119
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20119

Log:
Merged revision(s) 20118 from trunk/OpenMPT:
[Fix] r20005 broke retrieving extensions from file dialogs, as they were assumed to not contain a leading dot.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/FileDialog.cpp

Modified: branches/OpenMPT-1.31/mptrack/FileDialog.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/FileDialog.cpp	Sun Feb 11 00:27:49 2024	(r20118)
+++ branches/OpenMPT-1.31/mptrack/FileDialog.cpp	Sun Feb 11 00:28:08 2024	(r20119)
@@ -187,6 +187,8 @@
 	// those offsets are in terms of the .lnk file, while lpstrFile contains the resolved target of that link.
 	m_workingDirectory = m_filenames.front().GetDirectoryWithDrive();
 	m_extension = m_filenames.front().GetFilenameExtension();
+	if(!m_extension.empty())
+		m_extension.erase(0, 1);
 
 	return true;
 }

[OMPT-svn-commit] OpenMPT r20118 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Feb 11 00:27:49 2024
New Revision: 20118
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20118

Log:
[Fix] r20005 broke retrieving extensions from file dialogs, as they were assumed to not contain a leading dot.

Modified:
   trunk/OpenMPT/mptrack/FileDialog.cpp

Modified: trunk/OpenMPT/mptrack/FileDialog.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/FileDialog.cpp	Sat Feb 10 17:41:41 2024	(r20117)
+++ trunk/OpenMPT/mptrack/FileDialog.cpp	Sun Feb 11 00:27:49 2024	(r20118)
@@ -189,6 +189,8 @@
 	// those offsets are in terms of the .lnk file, while lpstrFile contains the resolved target of that link.
 	m_workingDirectory = m_filenames.front().GetDirectoryWithDrive();
 	m_extension = m_filenames.front().GetFilenameExtension();
+	if(!m_extension.empty())
+		m_extension.erase(0, 1);
 
 	return true;
 }

[OMPT-svn-commit] OpenMPT r20117 - trunk/OpenMPT/mptrack/plugins

[<sv...@op...>]

Author: sagamusix
Date: Sat Feb 10 17:41:41 2024
New Revision: 20117
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20117

Log:
[Fix] Partially revert refactoring from previous revision, VS Clang does not appear to like it.

Modified:
   trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp

Modified: trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp	Sat Feb 10 15:37:22 2024	(r20116)
+++ trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp	Sat Feb 10 17:41:41 2024	(r20117)
@@ -281,7 +281,7 @@
 		{
 			if(m_sendTimingInfo)
 			{
-				m_outQueue.emplace_back(GetOutputTimestamp(), unsigned char(0xF8));
+				m_outQueue.push_back(Message(GetOutputTimestamp(), 0xF8));
 			}
 
 			double bpm = m_SndFile.GetCurrentBPM();
@@ -429,7 +429,7 @@
 	}
 
 	mpt::lock_guard<mpt::mutex> lock(m_mutex);
-	m_outQueue.emplace_back(GetOutputTimestamp(), &midiCode, MIDIEvents::GetEventLength(static_cast<uint8>(midiCode)));
+	m_outQueue.push_back(Message(GetOutputTimestamp(), &midiCode, MIDIEvents::GetEventLength(static_cast<uint8>(midiCode))));
 	return true;
 }
 
@@ -443,7 +443,7 @@
 	}
 
 	mpt::lock_guard<mpt::mutex> lock(m_mutex);
-	m_outQueue.emplace_back(GetOutputTimestamp(), sysex.data(), sysex.size());
+	m_outQueue.push_back(Message(GetOutputTimestamp(), sysex.data(), sysex.size()));
 	return true;
 }
 

[OMPT-svn-commit] OpenMPT r20116 - trunk/OpenMPT/mptrack/plugins

[<sv...@op...>]

Author: sagamusix
Date: Sat Feb 10 15:37:22 2024
New Revision: 20116
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20116

Log:
[Fix] MIDI I/O Plugin: Try to re-open the correct device (identified by name or friendly name) after a device ID change.

Modified:
   trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp
   trunk/OpenMPT/mptrack/plugins/MidiInOut.h

Modified: trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp	Wed Feb  7 17:28:43 2024	(r20115)
+++ trunk/OpenMPT/mptrack/plugins/MidiInOut.cpp	Sat Feb 10 15:37:22 2024	(r20116)
@@ -82,11 +82,11 @@
 
 enum ChunkFlags
 {
-	kLatencyCompensation	= 0x01,	// Implicit in current plugin version
-	kLatencyPresent			= 0x02,	// Latency value is present as double-precision float
-	kIgnoreTiming			= 0x04,	// Do not send timing and sequencing information
-	kFriendlyInputName		= 0x08,	// Preset also stores friendly name of input device
-	kFriendlyOutputName		= 0x10,	// Preset also stores friendly name of output device
+	kLatencyCompensation = 0x01,  // Implicit in current plugin version
+	kLatencyPresent      = 0x02,  // Latency value is present as double-precision float
+	kIgnoreTiming        = 0x04,  // Do not send timing and sequencing information
+	kFriendlyInputName   = 0x08,  // Preset also stores friendly name of input device
+	kFriendlyOutputName  = 0x10,  // Preset also stores friendly name of output device
 };
 
 IMixPlugin::ChunkData MidiInOut::GetChunk(bool /*isBank*/)
@@ -202,9 +202,9 @@
 	m_sendTimingInfo = !(flags & kIgnoreTiming);
 
 	if(flags & kFriendlyInputName)
-		file.ReadString<mpt::String::maybeNullTerminated>(inFriendlyName, file.ReadUint32LE());
+		file.ReadSizedString<uint32le, mpt::String::maybeNullTerminated>(inFriendlyName);
 	if(flags & kFriendlyOutputName)
-		file.ReadString<mpt::String::maybeNullTerminated>(outFriendlyName, file.ReadUint32LE());
+		file.ReadSizedString<uint32le, mpt::String::maybeNullTerminated>(outFriendlyName);
 
 	// Try to match an input port name against stored name or friendly name (preferred)
 	FindPort(inID, m_midiIn.getPortCount(), inName, inFriendlyName, m_inputDevice, true);
@@ -281,7 +281,7 @@
 		{
 			if(m_sendTimingInfo)
 			{
-				m_outQueue.push_back(Message(GetOutputTimestamp(), 0xF8));
+				m_outQueue.emplace_back(GetOutputTimestamp(), unsigned char(0xF8));
 			}
 
 			double bpm = m_SndFile.GetCurrentBPM();
@@ -356,8 +356,8 @@
 		m_outQueue.clear();
 	}
 	m_clock.SetResolution(1);
-	OpenDevice(m_inputDevice.index, true);
-	OpenDevice(m_outputDevice.index, false);
+	OpenDevice(m_inputDevice, true);
+	OpenDevice(m_outputDevice, false);
 	if(m_midiOut.isPortOpen() && m_sendTimingInfo && !m_SndFile.IsPaused())
 	{
 		MidiSend(0xFA);	// Start
@@ -429,7 +429,7 @@
 	}
 
 	mpt::lock_guard<mpt::mutex> lock(m_mutex);
-	m_outQueue.push_back(Message(GetOutputTimestamp(), &midiCode, MIDIEvents::GetEventLength(static_cast<uint8>(midiCode))));
+	m_outQueue.emplace_back(GetOutputTimestamp(), &midiCode, MIDIEvents::GetEventLength(static_cast<uint8>(midiCode)));
 	return true;
 }
 
@@ -443,7 +443,7 @@
 	}
 
 	mpt::lock_guard<mpt::mutex> lock(m_mutex);
-	m_outQueue.push_back(Message(GetOutputTimestamp(), sysex.data(), sysex.size()));
+	m_outQueue.emplace_back(GetOutputTimestamp(), sysex.data(), sysex.size());
 	return true;
 }
 
@@ -456,7 +456,7 @@
 		Resume();
 	}
 
-	for(uint8 mc = 0; mc < std::size(m_MidiCh); mc++)		//all midi chans
+	for(uint8 mc = 0; mc < std::size(m_MidiCh); mc++)  //all midi chans
 	{
 		PlugInstrChannel &channel = m_MidiCh[mc];
 		channel.ResetProgram(m_SndFile.m_playBehaviour[kPluginDefaultProgramAndBank1]);
@@ -484,6 +484,18 @@
 }
 
 
+// Open a device for input or output.
+void MidiInOut::OpenDevice(MidiDevice newDevice, bool asInputDevice)
+{
+	std::string friendlyName;
+#ifdef MODPLUG_TRACKER
+	friendlyName = mpt::ToCharset(mpt::Charset::UTF8, theApp.GetFriendlyMIDIPortName(mpt::ToUnicode(mpt::Charset::UTF8, newDevice.name), asInputDevice, false));
+#endif // MODPLUG_TRACKER
+	FindPort(newDevice.index, asInputDevice ? m_midiIn.getPortCount() : m_midiOut.getPortCount(), newDevice.name, friendlyName, newDevice, asInputDevice);
+	SetParameter(asInputDevice ? MidiInOut::kInputParameter : MidiInOut::kOutputParameter, DeviceIDToParameter(newDevice.index));
+}
+
+
 // Open a device for input or output.
 void MidiInOut::OpenDevice(MidiDevice::ID newDevice, bool asInputDevice)
 {

Modified: trunk/OpenMPT/mptrack/plugins/MidiInOut.h
==============================================================================
--- trunk/OpenMPT/mptrack/plugins/MidiInOut.h	Wed Feb  7 17:28:43 2024	(r20115)
+++ trunk/OpenMPT/mptrack/plugins/MidiInOut.h	Sat Feb 10 15:37:22 2024	(r20116)
@@ -216,6 +216,7 @@
 
 protected:
 	// Open a device for input or output.
+	void OpenDevice(MidiDevice newDevice, bool asInputDevice);
 	void OpenDevice(MidiDevice::ID newDevice, bool asInputDevice);
 	// Close an active device.
 	void CloseDevice(MidiDevice &device);

[OMPT-svn-commit] OpenMPT r20115 - in branches/OpenMPT-1.31: . build

[<sv...@op...>]

Author: manx
Date: Wed Feb  7 17:28:43 2024
New Revision: 20115
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20115

Log:
Merged revision(s) 20114 from trunk/OpenMPT:
[Var] python: Update to v3.12.2.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/download_externals.cmd

Modified: branches/OpenMPT-1.31/build/download_externals.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/download_externals.cmd	Wed Feb  7 17:28:17 2024	(r20114)
+++ branches/OpenMPT-1.31/build/download_externals.cmd	Wed Feb  7 17:28:43 2024	(r20115)
@@ -44,7 +44,7 @@
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe"                 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error
 
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.1/python-3.12.1-embed-amd64.zip"                          "build\externals\python-3.12.1-embed-amd64.zip" b46aa3b188dbe8c3f8b14f3f5ca8722b2ed4c37046f743fa3dc9bab8e2eee55c70c1184a5e3f8e22ea71c60aa8d414668facf3565cc24c896de991b7d3f9930d 11061655 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.2/python-3.12.2-embed-amd64.zip"                          "build\externals\python-3.12.2-embed-amd64.zip" 51b8f926f5591e804e4ce635ba7b2e944ba99a20834680fd7816063986ebcebdc26fc718c3ff39d478ced3b5c45f6e7500a4f306246bd84cbf5e6d3a6d05f7f4 11068186 || goto error
 
 
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar"  "build\externals\innounp050.rar"               dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330  141621 || goto error
@@ -73,7 +73,7 @@
 call build\scriptlib\unpack.cmd "include\winamp"   "build\externals\WA5.55_SDK.exe" "."          || goto error
 call build\scriptlib\unpack.cmd "include\xmplay"   "build\externals\xmp-sdk.zip"    "."          || goto error
 
-call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.1-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.2-embed-amd64.zip" "." || goto error
 
 call :killdir "build\tools\innounp"   || goto error
 call :killdir "build\tools\innosetup" || goto error

[OMPT-svn-commit] OpenMPT r20114 - trunk/OpenMPT/build

[<sv...@op...>]

Author: manx
Date: Wed Feb  7 17:28:17 2024
New Revision: 20114
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20114

Log:
[Var] python: Update to v3.12.2.

Modified:
   trunk/OpenMPT/build/download_externals.cmd

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Mon Feb  5 18:47:13 2024	(r20113)
+++ trunk/OpenMPT/build/download_externals.cmd	Wed Feb  7 17:28:17 2024	(r20114)
@@ -44,7 +44,7 @@
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe"                 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error
 
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.1/python-3.12.1-embed-amd64.zip"                          "build\externals\python-3.12.1-embed-amd64.zip" b46aa3b188dbe8c3f8b14f3f5ca8722b2ed4c37046f743fa3dc9bab8e2eee55c70c1184a5e3f8e22ea71c60aa8d414668facf3565cc24c896de991b7d3f9930d 11061655 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.2/python-3.12.2-embed-amd64.zip"                          "build\externals\python-3.12.2-embed-amd64.zip" 51b8f926f5591e804e4ce635ba7b2e944ba99a20834680fd7816063986ebcebdc26fc718c3ff39d478ced3b5c45f6e7500a4f306246bd84cbf5e6d3a6d05f7f4 11068186 || goto error
 
 
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar"  "build\externals\innounp050.rar"               dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330  141621 || goto error
@@ -73,7 +73,7 @@
 call build\scriptlib\unpack.cmd "include\winamp"   "build\externals\WA5.55_SDK.exe" "."          || goto error
 call build\scriptlib\unpack.cmd "include\xmplay"   "build\externals\xmp-sdk.zip"    "."          || goto error
 
-call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.1-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.2-embed-amd64.zip" "." || goto error
 
 call :killdir "build\tools\innounp"   || goto error
 call :killdir "build\tools\innosetup" || goto error

[OMPT-svn-commit] OpenMPT r20113 - in branches/OpenMPT-1.28: . soundlib

[<sv...@op...>]

Author: sagamusix
Date: Mon Feb  5 18:47:13 2024
New Revision: 20113
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20113

Log:
Merged revision(s) 20109 from trunk/OpenMPT:
[Fix] IT: MIDI macros were reset in IT 2.14 / 2.15 files that declared to be compatible with older IT versions (fixes spx-visionsofthepast.it, https://bugs.openmpt.org/view.php?id=1745).
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/soundlib/Load_it.cpp

Modified: branches/OpenMPT-1.28/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Load_it.cpp	Mon Feb  5 18:46:55 2024	(r20112)
+++ branches/OpenMPT-1.28/soundlib/Load_it.cpp	Mon Feb  5 18:47:13 2024	(r20113)
@@ -698,7 +698,9 @@
 	}
 
 	// Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns.
-	if(fileHeader.cwtv < 0x0214)
+	// Example: denonde.it by Mystical
+	// Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it).
+	if(fileHeader.cmwt < 0x0214)
 	{
 		m_MidiCfg.ClearZxxMacros();
 	}

[OMPT-svn-commit] OpenMPT r20112 - in branches/OpenMPT-1.29: . soundlib

[<sv...@op...>]

Author: sagamusix
Date: Mon Feb  5 18:46:55 2024
New Revision: 20112
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20112

Log:
Merged revision(s) 20109 from trunk/OpenMPT:
[Fix] IT: MIDI macros were reset in IT 2.14 / 2.15 files that declared to be compatible with older IT versions (fixes spx-visionsofthepast.it, https://bugs.openmpt.org/view.php?id=1745).
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/soundlib/Load_it.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_it.cpp	Mon Feb  5 18:46:39 2024	(r20111)
+++ branches/OpenMPT-1.29/soundlib/Load_it.cpp	Mon Feb  5 18:46:55 2024	(r20112)
@@ -707,7 +707,9 @@
 	}
 
 	// Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns.
-	if(fileHeader.cwtv < 0x0214)
+	// Example: denonde.it by Mystical
+	// Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it).
+	if(fileHeader.cmwt < 0x0214)
 	{
 		m_MidiCfg.ClearZxxMacros();
 	}