modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r21793 - in branches/OpenMPT-1.28: . .github/workflows

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

Author: manx
Date: Thu Oct 10 09:54:14 2024
New Revision: 21793
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21793

Log:
Merged revision(s) 21791 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Do not upgrade Homebrew packages on macOS 12 because it is unsupported and upgrading causes all kinds of problems. Just install our dependencies. See r21789.
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml

Modified: branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml	Thu Oct 10 09:53:52 2024	(r21792)
+++ branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml	Thu Oct 10 09:54:14 2024	(r21793)
@@ -27,8 +27,6 @@
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
-    - name: upgrade packages
-      run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make

[OMPT-svn-commit] OpenMPT r21792 - in branches/OpenMPT-1.29: . .github/workflows

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

Author: manx
Date: Thu Oct 10 09:53:52 2024
New Revision: 21792
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21792

Log:
Merged revision(s) 21791 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Do not upgrade Homebrew packages on macOS 12 because it is unsupported and upgrading causes all kinds of problems. Just install our dependencies. See r21789.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml

Modified: branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Thu Oct 10 09:53:31 2024	(r21791)
+++ branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Thu Oct 10 09:53:52 2024	(r21792)
@@ -27,8 +27,6 @@
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
-    - name: upgrade packages
-      run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make

[OMPT-svn-commit] OpenMPT r21791 - branches/OpenMPT-1.30/.github/workflows

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

Author: manx
Date: Thu Oct 10 09:53:31 2024
New Revision: 21791
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21791

Log:
[Fix] build: CI: GitHub: macOS: Do not upgrade Homebrew packages on macOS 12 because it is unsupported and upgrading causes all kinds of problems. Just install our dependencies. See r21789.

Modified:
   branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml	Thu Oct 10 09:52:54 2024	(r21790)
+++ branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml	Thu Oct 10 09:53:31 2024	(r21791)
@@ -27,8 +27,6 @@
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
-    - name: upgrade packages
-      run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make

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

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

Author: manx
Date: Thu Oct 10 09:52:54 2024
New Revision: 21790
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21790

Log:
Merged revision(s) 21789 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: Do not upgrade Homebrew packages on macOS 12 because it is unsupported and upgrading causes all kinds of problems. Just install our dependencies.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Thu Oct 10 09:52:28 2024	(r21789)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Thu Oct 10 09:52:54 2024	(r21790)
@@ -41,6 +41,7 @@
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
     - name: upgrade packages
+      if: ${{ matrix.host != 'macos-12' }}
       run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Thu Oct 10 09:52:28 2024	(r21789)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Thu Oct 10 09:52:54 2024	(r21790)
@@ -89,6 +89,7 @@
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
     - name: upgrade packages
+      if: ${{ matrix.host != 'macos-12' }}
       run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2

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

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

Author: manx
Date: Thu Oct 10 09:52:28 2024
New Revision: 21789
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21789

Log:
[Fix] build: CI: GitHub: macOS: Do not upgrade Homebrew packages on macOS 12 because it is unsupported and upgrading causes all kinds of problems. Just install our dependencies.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Tue Oct  8 20:24:51 2024	(r21788)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Thu Oct 10 09:52:28 2024	(r21789)
@@ -43,6 +43,7 @@
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
     - name: upgrade packages
+      if: ${{ matrix.host != 'macos-12' }}
       run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Tue Oct  8 20:24:51 2024	(r21788)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Oct 10 09:52:28 2024	(r21789)
@@ -91,6 +91,7 @@
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
     - name: upgrade packages
+      if: ${{ matrix.host != 'macos-12' }}
       run: brew upgrade
     - name: install dependencies
       run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2

[OMPT-svn-commit] OpenMPT r21788 - trunk/OpenMPT/soundlib

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

Author: sagamusix
Date: Tue Oct  8 20:24:51 2024
New Revision: 21788
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21788

Log:
[Imp] Insert pattern break commands in MOD/S3M when trying to save patterns shorter than 64 rows.

Modified:
   trunk/OpenMPT/soundlib/Load_mod.cpp
   trunk/OpenMPT/soundlib/Load_s3m.cpp
   trunk/OpenMPT/soundlib/pattern.cpp
   trunk/OpenMPT/soundlib/pattern.h

Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp	Tue Oct  8 14:07:50 2024	(r21787)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp	Tue Oct  8 20:24:51 2024	(r21788)
@@ -1004,6 +1004,7 @@
 				continue;
 			}
 			const auto rowBase = Patterns[pat].GetRow(row);
+			bool writePatternBreak = (Patterns[pat].GetNumRows() < 64 && row + 1 == Patterns[pat].GetNumRows() && !Patterns[pat].RowHasJump(row));
 
 			events.resize(writeChannels * 4);
 			size_t eventByte = 0;
@@ -1019,6 +1020,11 @@
 					command = 0x0C;
 					param = std::min(m.vol, uint8(64));
 				}
+				if(writePatternBreak && !command && !param)
+				{
+					command = 0x0D;
+					writePatternBreak = false;
+				}
 
 				uint16 period = 0;
 				// Convert note to period

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Tue Oct  8 14:07:50 2024	(r21787)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Tue Oct  8 20:24:51 2024	(r21788)
@@ -914,6 +914,7 @@
 				const auto rowBase = Patterns[pat].GetRow(row);
 
 				CHANNELINDEX writeChannels = std::min(CHANNELINDEX(32), GetNumChannels());
+				bool writePatternBreak = (Patterns[pat].GetNumRows() < 64 && row + 1 == Patterns[pat].GetNumRows() && !Patterns[pat].RowHasJump(row));
 				for(CHANNELINDEX chn = 0; chn < writeChannels; chn++)
 				{
 					const ModCommand &m = rowBase[chn];
@@ -979,6 +980,12 @@
 							}
 						}
 					}
+					if(writePatternBreak && !(info & s3mEffectPresent))
+					{
+						info |= s3mEffectPresent;
+						command = 'C' ^ 0x40;
+						writePatternBreak = false;
+					}
 
 					if(info & s3mAnyPresent)
 					{

Modified: trunk/OpenMPT/soundlib/pattern.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp	Tue Oct  8 14:07:50 2024	(r21787)
+++ trunk/OpenMPT/soundlib/pattern.cpp	Tue Oct  8 20:24:51 2024	(r21788)
@@ -37,21 +37,32 @@
 bool CPattern::IsEmptyRow(ROWINDEX row) const noexcept
 {
 	if(m_ModCommands.empty() || !IsValidRow(row))
-	{
 		return true;
-	}
 
 	for(const auto &m : GetRow(row))
 	{
 		if(!m.IsEmpty())
-		{
 			return false;
-		}
 	}
 	return true;
 }
 
 
+// Check if the row contains any position jumps or pattern breaks.
+bool CPattern::RowHasJump(ROWINDEX row) const noexcept
+{
+	if(m_ModCommands.empty() || !IsValidRow(row))
+		return false;
+
+	for(const auto &m : GetRow(row))
+	{
+		if(m.command == CMD_PATTERNBREAK || m.command == CMD_POSITIONJUMP)
+			return true;
+	}
+	return false;
+}
+
+
 bool CPattern::SetSignature(const ROWINDEX rowsPerBeat, const ROWINDEX rowsPerMeasure) noexcept
 {
 	if(rowsPerBeat < 1

Modified: trunk/OpenMPT/soundlib/pattern.h
==============================================================================
--- trunk/OpenMPT/soundlib/pattern.h	Tue Oct  8 14:07:50 2024	(r21787)
+++ trunk/OpenMPT/soundlib/pattern.h	Tue Oct  8 20:24:51 2024	(r21788)
@@ -60,6 +60,8 @@
 
 	// Check if there is any note data on a given row.
 	bool IsEmptyRow(ROWINDEX row) const noexcept;
+	// Check if the row contains any position jumps or pattern breaks.
+	bool RowHasJump(ROWINDEX row) const noexcept;
 
 	// Allocate new pattern memory and replace old pattern data.
 	bool AllocatePattern(ROWINDEX rows);

[OMPT-svn-commit] OpenMPT r21787 - branches/OpenMPT-1.31/build

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

Author: manx
Date: Tue Oct  8 14:07:50 2024
New Revision: 21787
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21787

Log:
[Var] python: Update to v3.13.0. See r21785.

Modified:
   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	Mon Oct  7 21:22:40 2024	(r21786)
+++ branches/OpenMPT-1.31/build/download_externals.cmd	Tue Oct  8 14:07:50 2024	(r21787)
@@ -44,7 +44,7 @@
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813id_/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.7/python-3.12.7-embed-amd64.zip" "build\externals\python-3.12.7-embed-amd64.zip" 2f67a8487a9edece26b73aab27e75249e538938ad976d371a9411b54dbae20afeac82b406ad4eeee38b1cf6f407e7620679d30c0fff82ec8e8ae62268c322d59 11062583 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.13.0/python-3.13.0-embed-amd64.zip" "build\externals\python-3.13.0-embed-amd64.zip" f93e687572df1ca592b7a35015b92ed3b65b0bac4cd94dec76962411203858a198b681712fbaa5ae021058e7e1493c4da6c9f9a56c66ecf83ce3ef44d558690a 12499601 || 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.6-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.13.0-embed-amd64.zip" "." || goto error
 
 call :killdir "build\tools\innounp"   || goto error
 call :killdir "build\tools\innosetup" || goto error

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

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

Author: sagamusix
Date: Mon Oct  7 21:22:40 2024
New Revision: 21786
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21786

Log:
[Fix] Folder picker broke in r21643 when using modern style, returning the original working directory instead of the new one (https://bugs.openmpt.org/view.php?id=1823).

Modified:
   trunk/OpenMPT/mptrack/FileDialog.cpp

Modified: trunk/OpenMPT/mptrack/FileDialog.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/FileDialog.cpp	Mon Oct  7 19:31:17 2024	(r21785)
+++ trunk/OpenMPT/mptrack/FileDialog.cpp	Mon Oct  7 21:22:40 2024	(r21786)
@@ -241,7 +241,7 @@
 		dlg.m_ofn.lpstrTitle = m_caption;
 		if(dlg.DoModal() != IDOK)
 			return false;
-		m_workingDirectory = mpt::PathString::FromCString(dlg.GetFolderPath());
+		m_workingDirectory = mpt::PathString::FromCString(dlg.GetPathName());
 		return true;
 	}
 

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

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

Author: manx
Date: Mon Oct  7 19:31:17 2024
New Revision: 21785
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21785

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

Modified:
   trunk/OpenMPT/build/download_externals.cmd
   trunk/OpenMPT/build/download_externals.txt

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Mon Oct  7 19:13:39 2024	(r21784)
+++ trunk/OpenMPT/build/download_externals.cmd	Mon Oct  7 19:31:17 2024	(r21785)
@@ -47,7 +47,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.7-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.13.0-embed-amd64.zip" "." || goto error
 
 
 call :killdir "build\tools\innosetup" || goto error

Modified: trunk/OpenMPT/build/download_externals.txt
==============================================================================
--- trunk/OpenMPT/build/download_externals.txt	Mon Oct  7 19:13:39 2024	(r21784)
+++ trunk/OpenMPT/build/download_externals.txt	Mon Oct  7 19:31:17 2024	(r21785)
@@ -4,7 +4,7 @@
 "build/externals/WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
 "build/externals/xmp-sdk.zip"                     322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip"
 "build/externals/htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe"
-"build/externals/python-3.12.7-embed-amd64.zip" 11062583 2f67a8487a9edece26b73aab27e75249e538938ad976d371a9411b54dbae20afeac82b406ad4eeee38b1cf6f407e7620679d30c0fff82ec8e8ae62268c322d59 "https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-amd64.zip"
+"build/externals/python-3.13.0-embed-amd64.zip" 12499601 f93e687572df1ca592b7a35015b92ed3b65b0bac4cd94dec76962411203858a198b681712fbaa5ae021058e7e1493c4da6c9f9a56c66ecf83ce3ef44d558690a "https://www.python.org/ftp/python/3.13.0/python-3.13.0-embed-amd64.zip"
 "build/externals/innounp050.rar"                  141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar"
 "build/externals/innosetup-6.3.3.exe"            5634744 785e7cdad84da42ddfc94f8e20b7150a92fbca1904cfa4d7e23f68b874fba134e9c91a1fb5a8291e7e334f57c1063061d3e8496a2d9e7c4d9415ea9f12a3522e "https://files.jrsoftware.org/is/6/innosetup-6.3.3.exe" "https://files.innosetup.nl/innosetup-6.3.3.exe"
 "build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"

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

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

Author: sagamusix
Date: Mon Oct  7 19:13:39 2024
New Revision: 21784
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21784

Log:
Merged revision(s) 21783 from trunk/OpenMPT:
[Fix] Stream export: Aborting during normalization was not possible.
........

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

Modified: branches/OpenMPT-1.31/mptrack/Mod2wave.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Mod2wave.cpp	Mon Oct  7 19:13:12 2024	(r21783)
+++ branches/OpenMPT-1.31/mptrack/Mod2wave.cpp	Mon Oct  7 19:13:39 2024	(r21784)
@@ -1357,6 +1357,11 @@
 					lastPercent = percent;
 				}
 				ProcessMessages();
+				if(m_abort)
+				{
+					ok = IDCANCEL;
+					break;
+				}
 			}
 
 			framesProcessed += framesChunk;

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

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

Author: sagamusix
Date: Mon Oct  7 19:13:12 2024
New Revision: 21783
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21783

Log:
[Fix] Stream export: Aborting during normalization was not possible.

Modified:
   trunk/OpenMPT/mptrack/Mod2wave.cpp

Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp	Sat Oct  5 02:43:11 2024	(r21782)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp	Mon Oct  7 19:13:12 2024	(r21783)
@@ -1368,6 +1368,11 @@
 					lastPercent = percent;
 				}
 				ProcessMessages();
+				if(m_abort)
+				{
+					ok = IDCANCEL;
+					break;
+				}
 			}
 
 			framesProcessed += framesChunk;

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

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

Author: sagamusix
Date: Sat Oct  5 02:43:11 2024
New Revision: 21782
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21782

Log:
[Ref] Fix a number of misleading comments that could confuse the VS GUI code generation, if we ever used it...

Modified:
   trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp
   trunk/OpenMPT/mptrack/CleanupSong.cpp
   trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp

Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp	Tue Oct  1 21:53:12 2024	(r21781)
+++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp	Sat Oct  5 02:43:11 2024	(r21782)
@@ -32,7 +32,7 @@
 void COptionsAdvanced::DoDataExchange(CDataExchange* pDX)
 {
 	CPropertyPage::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CModTypeDlg)
+	//{{AFX_DATA_MAP(COptionsAdvanced)
 	DDX_Control(pDX, IDC_LIST1, m_List);
 	//}}AFX_DATA_MAP
 }

Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp	Tue Oct  1 21:53:12 2024	(r21781)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp	Sat Oct  5 02:43:11 2024	(r21782)
@@ -80,7 +80,7 @@
 // CModCleanupDlg
 
 BEGIN_MESSAGE_MAP(CModCleanupDlg, DialogBase)
-	//{{AFX_MSG_MAP(CModTypeDlg)
+	//{{AFX_MSG_MAP(CModCleanupDlg)
 	ON_COMMAND(IDC_BTN_CLEANUP_SONG,			&CModCleanupDlg::OnPresetCleanupSong)
 	ON_COMMAND(IDC_BTN_COMPO_CLEANUP,			&CModCleanupDlg::OnPresetCompoCleanup)
 

Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp	Tue Oct  1 21:53:12 2024	(r21781)
+++ trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp	Sat Oct  5 02:43:11 2024	(r21782)
@@ -80,7 +80,7 @@
 void COptionsGeneral::DoDataExchange(CDataExchange* pDX)
 {
 	CPropertyPage::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CModTypeDlg)
+	//{{AFX_DATA_MAP(COptionsGeneral)
 	DDX_Control(pDX, IDC_LIST1,		m_CheckList);
 	DDX_Control(pDX, IDC_EDIT1,		m_defaultArtist);
 	DDX_Control(pDX, IDC_COMBO2,	m_defaultTemplate);

[OMPT-svn-commit] OpenMPT r21781 - trunk/OpenMPT/soundlib/plugins

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

Author: sagamusix
Date: Tue Oct  1 21:53:12 2024
New Revision: 21781
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21781

Log:
[Mod] Simplify display of bridged plugin architecture.

Modified:
   trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
   trunk/OpenMPT/soundlib/plugins/PluginManager.h

Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Tue Oct  1 19:40:44 2024	(r21780)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Tue Oct  1 21:53:12 2024	(r21781)
@@ -137,52 +137,6 @@
 }
 
 
-mpt::ustring VSTPluginLib::GetPluginArchNameUser(uint8 arch)
-{
-	mpt::ustring result;
-	#if defined(MPT_WITH_WINDOWS10)
-		switch(arch)
-		{
-		case PluginArch_x86:
-			result = U_("x86 (32bit)");
-			break;
-		case PluginArch_amd64:
-			result = U_("amd64 (64bit)");
-			break;
-		case PluginArch_arm:
-			result = U_("arm (32bit)");
-			break;
-		case PluginArch_arm64:
-			result = U_("arm64 (64bit)");
-			break;
-		default:
-			result = U_("");
-			break;
-		}
-	#else // !MPT_WITH_WINDOWS10
-		switch(arch)
-		{
-		case PluginArch_x86:
-			result = U_("32-Bit");
-			break;
-		case PluginArch_amd64:
-			result = U_("64-Bit");
-			break;
-		case PluginArch_arm:
-			result = U_("32-Bit");
-			break;
-		case PluginArch_arm64:
-			result = U_("64-Bit");
-			break;
-		default:
-			result = U_("");
-			break;
-		}
-	#endif // MPT_WITH_WINDOWS10
-	return result;
-}
-
-
 uint8 VSTPluginLib::GetDllArch(bool fromCache) const
 {
 	// Built-in plugins are always native.
@@ -208,7 +162,7 @@
 
 mpt::ustring VSTPluginLib::GetDllArchNameUser(bool fromCache) const
 {
-	return GetPluginArchNameUser(GetDllArch(fromCache));
+	return GetPluginArchName(GetDllArch(fromCache));
 }
 
 

Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.h
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.h	Tue Oct  1 19:40:44 2024	(r21780)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.h	Tue Oct  1 21:53:12 2024	(r21781)
@@ -106,7 +106,6 @@
 	// Get native phost process arch encoded as plugin arch
 	static uint8 GetNativePluginArch();
 	static mpt::ustring GetPluginArchName(uint8 arch);
-	static mpt::ustring GetPluginArchNameUser(uint8 arch);
 
 	// Check whether a plugin can be hosted inside OpenMPT or requires bridging
 	uint8 GetDllArch(bool fromCache = true) const;

[OMPT-svn-commit] OpenMPT r21780 - branches/OpenMPT-1.31/build

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

Author: manx
Date: Tue Oct  1 19:40:44 2024
New Revision: 21780
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21780

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

Modified:
   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	Tue Oct  1 19:38:03 2024	(r21779)
+++ branches/OpenMPT-1.31/build/download_externals.cmd	Tue Oct  1 19:40:44 2024	(r21780)
@@ -44,7 +44,7 @@
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813id_/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.6/python-3.12.6-embed-amd64.zip" "build\externals\python-3.12.6-embed-amd64.zip" 43e9eab6fce7e62f1badf478706e3df7f65a9bb0fdff2ee01f71c65425acd8d73e4e0dcc64a6ee59a7d934be7271a4f0b9fe3e0da62a5ba636663f628bd7fbd7 11061146 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-amd64.zip" "build\externals\python-3.12.7-embed-amd64.zip" 2f67a8487a9edece26b73aab27e75249e538938ad976d371a9411b54dbae20afeac82b406ad4eeee38b1cf6f407e7620679d30c0fff82ec8e8ae62268c322d59 11062583 || 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

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

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

Author: manx
Date: Tue Oct  1 19:38:03 2024
New Revision: 21779
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21779

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

Modified:
   trunk/OpenMPT/build/download_externals.cmd
   trunk/OpenMPT/build/download_externals.txt

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Mon Sep 30 23:33:18 2024	(r21778)
+++ trunk/OpenMPT/build/download_externals.cmd	Tue Oct  1 19:38:03 2024	(r21779)
@@ -47,7 +47,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.6-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.7-embed-amd64.zip" "." || goto error
 
 
 call :killdir "build\tools\innosetup" || goto error

Modified: trunk/OpenMPT/build/download_externals.txt
==============================================================================
--- trunk/OpenMPT/build/download_externals.txt	Mon Sep 30 23:33:18 2024	(r21778)
+++ trunk/OpenMPT/build/download_externals.txt	Tue Oct  1 19:38:03 2024	(r21779)
@@ -4,7 +4,7 @@
 "build/externals/WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
 "build/externals/xmp-sdk.zip"                     322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip"
 "build/externals/htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe"
-"build/externals/python-3.12.6-embed-amd64.zip" 11061146 43e9eab6fce7e62f1badf478706e3df7f65a9bb0fdff2ee01f71c65425acd8d73e4e0dcc64a6ee59a7d934be7271a4f0b9fe3e0da62a5ba636663f628bd7fbd7 "https://www.python.org/ftp/python/3.12.6/python-3.12.6-embed-amd64.zip"
+"build/externals/python-3.12.7-embed-amd64.zip" 11062583 2f67a8487a9edece26b73aab27e75249e538938ad976d371a9411b54dbae20afeac82b406ad4eeee38b1cf6f407e7620679d30c0fff82ec8e8ae62268c322d59 "https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-amd64.zip"
 "build/externals/innounp050.rar"                  141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar"
 "build/externals/innosetup-6.3.3.exe"            5634744 785e7cdad84da42ddfc94f8e20b7150a92fbca1904cfa4d7e23f68b874fba134e9c91a1fb5a8291e7e334f57c1063061d3e8496a2d9e7c4d9415ea9f12a3522e "https://files.jrsoftware.org/is/6/innosetup-6.3.3.exe" "https://files.innosetup.nl/innosetup-6.3.3.exe"
 "build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"

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

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

Author: sagamusix
Date: Mon Sep 30 23:33:18 2024
New Revision: 21778
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21778

Log:
Merged revision(s) 21776-21777 from trunk/OpenMPT:
[Mod] Update tooltip: Make message less ambiguous.
........
[Fix] When importing instruments or converting to IT, restrict fadeout precision to multiples of 32.
[Fix] Find MPT Hacks: Detect IT instruments with fadeout values that are not multiples of 32.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/MPTHacks.cpp
   branches/OpenMPT-1.31/mptrack/UpdateToolTip.cpp
   branches/OpenMPT-1.31/soundlib/Load_it.cpp
   branches/OpenMPT-1.31/soundlib/ModInstrument.cpp

Modified: branches/OpenMPT-1.31/mptrack/MPTHacks.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/MPTHacks.cpp	Mon Sep 30 23:32:53 2024	(r21777)
+++ branches/OpenMPT-1.31/mptrack/MPTHacks.cpp	Mon Sep 30 23:33:18 2024	(r21778)
@@ -327,6 +327,13 @@
 				instr->VolEnv.nReleaseNode = instr->PanEnv.nReleaseNode = instr->PitchEnv.nReleaseNode = ENV_RELEASE_NODE_UNSET;
 			}
 		}
+		if((m_SndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) && (instr->nFadeOut % 32u) != 0)
+		{
+			foundHere = foundHacks = true;
+			if(autofix)
+				instr->nFadeOut = ((instr->nFadeOut + 16) / 32) * 32;
+		}
+
 		// Incompatible envelope shape
 		foundEnvelopes |= FindIncompatibleEnvelopes(instr->VolEnv, autofix);
 		foundEnvelopes |= FindIncompatibleEnvelopes(instr->PanEnv, autofix);

Modified: branches/OpenMPT-1.31/mptrack/UpdateToolTip.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/UpdateToolTip.cpp	Mon Sep 30 23:32:53 2024	(r21777)
+++ branches/OpenMPT-1.31/mptrack/UpdateToolTip.cpp	Mon Sep 30 23:33:18 2024	(r21778)
@@ -32,7 +32,7 @@
 
 	m_infoURL = infoURL;
 
-	CString message = MPT_CFORMAT("OpenMPT {} has been released.\n<a>Click here to see what's new.</a>")(newVersion);
+	CString message = MPT_CFORMAT("OpenMPT {} has been released.\nClick on this message to install the update,\nor <a>click here to see what's new.</a>")(newVersion);
 	TOOLINFO ti{};
 	ti.cbSize = TTTOOLINFO_V1_SIZE;
 	ti.uFlags = TTF_TRACK | TTF_PARSELINKS;

Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 23:32:53 2024	(r21777)
+++ branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 23:33:18 2024	(r21778)
@@ -1144,7 +1144,7 @@
 					m.command = CMD_DUMMY;
 				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
-				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
+				else if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
 					m.param = 0x80;
 
 				// In some IT-compatible trackers, it is possible to input a parameter without a command.

Modified: branches/OpenMPT-1.31/soundlib/ModInstrument.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/ModInstrument.cpp	Mon Sep 30 23:32:53 2024	(r21777)
+++ branches/OpenMPT-1.31/soundlib/ModInstrument.cpp	Mon Sep 30 23:33:18 2024	(r21778)
@@ -226,10 +226,11 @@
 		}
 	}
 
-	// Limit fadeout length for IT
+	// Limit fadeout length and precision for IT
 	if(toType & MOD_TYPE_IT)
 	{
 		LimitMax(nFadeOut, 8192u);
+		nFadeOut = ((nFadeOut + 16) / 32) * 32;
 	}
 
 	// MPT-specific features - remove instrument tunings, Pitch/Tempo Lock, cutoff / resonance swing and filter mode for other formats

[OMPT-svn-commit] OpenMPT r21777 - in trunk/OpenMPT: mptrack soundlib

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

Author: sagamusix
Date: Mon Sep 30 23:32:53 2024
New Revision: 21777
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21777

Log:
[Fix] When importing instruments or converting to IT, restrict fadeout precision to multiples of 32.
[Fix] Find MPT Hacks: Detect IT instruments with fadeout values that are not multiples of 32.

Modified:
   trunk/OpenMPT/mptrack/MPTHacks.cpp
   trunk/OpenMPT/soundlib/Load_it.cpp
   trunk/OpenMPT/soundlib/ModInstrument.cpp

Modified: trunk/OpenMPT/mptrack/MPTHacks.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MPTHacks.cpp	Mon Sep 30 22:04:36 2024	(r21776)
+++ trunk/OpenMPT/mptrack/MPTHacks.cpp	Mon Sep 30 23:32:53 2024	(r21777)
@@ -339,6 +339,13 @@
 				instr->VolEnv.nReleaseNode = instr->PanEnv.nReleaseNode = instr->PitchEnv.nReleaseNode = ENV_RELEASE_NODE_UNSET;
 			}
 		}
+		if((m_SndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) && (instr->nFadeOut % 32u) != 0)
+		{
+			foundHere = foundHacks = true;
+			if(autofix)
+				instr->nFadeOut = ((instr->nFadeOut + 16) / 32) * 32;
+		}
+
 		// Incompatible envelope shape
 		foundEnvelopes |= FindIncompatibleEnvelopes(instr->VolEnv, autofix);
 		foundEnvelopes |= FindIncompatibleEnvelopes(instr->PanEnv, autofix);

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 22:04:36 2024	(r21776)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 23:32:53 2024	(r21777)
@@ -1136,7 +1136,7 @@
 					m.command = CMD_DUMMY;
 				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
-				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
+				else if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
 					m.param = 0x80;
 
 				// In some IT-compatible trackers, it is possible to input a parameter without a command.

Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp	Mon Sep 30 22:04:36 2024	(r21776)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp	Mon Sep 30 23:32:53 2024	(r21777)
@@ -227,10 +227,11 @@
 		}
 	}
 
-	// Limit fadeout length for IT
+	// Limit fadeout length and precision for IT
 	if(toType & MOD_TYPE_IT)
 	{
 		LimitMax(nFadeOut, 8192u);
+		nFadeOut = ((nFadeOut + 16) / 32) * 32;
 	}
 
 	// MPT-specific features - remove instrument tunings, Pitch/Tempo Lock, cutoff / resonance swing and filter mode for other formats

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

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

Author: sagamusix
Date: Mon Sep 30 22:04:36 2024
New Revision: 21776
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21776

Log:
[Mod] Update tooltip: Make message less ambiguous.

Modified:
   trunk/OpenMPT/mptrack/UpdateToolTip.cpp

Modified: trunk/OpenMPT/mptrack/UpdateToolTip.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/UpdateToolTip.cpp	Mon Sep 30 19:11:33 2024	(r21775)
+++ trunk/OpenMPT/mptrack/UpdateToolTip.cpp	Mon Sep 30 22:04:36 2024	(r21776)
@@ -34,7 +34,7 @@
 
 	m_infoURL = infoURL;
 
-	CString message = MPT_CFORMAT("OpenMPT {} has been released.\n<a>Click here to see what's new.</a>")(newVersion);
+	CString message = MPT_CFORMAT("OpenMPT {} has been released.\nClick on this message to install the update,\nor <a>click here to see what's new.</a>")(newVersion);
 	TOOLINFO ti{};
 	ti.cbSize = TTTOOLINFO_V1_SIZE;
 	ti.uFlags = TTF_TRACK | TTF_PARSELINKS;

[OMPT-svn-commit] OpenMPT r21775 - in branches/OpenMPT-1.31: . soundlib

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

Author: sagamusix
Date: Mon Sep 30 19:11:33 2024
New Revision: 21775
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21775

Log:
Merged revision(s) 21774 from trunk/OpenMPT:
[Fix] IT: SAx import was bound to "compatible" tracker, not "made with" tracker ID.
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 19:11:15 2024	(r21774)
+++ branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 19:11:33 2024	(r21775)
@@ -1140,7 +1140,7 @@
 				S3MConvert(m, command, param, true);
 
 				// IT 1.xx does not support high offset command
-				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cmwt < 0x0200)
+				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cwtv < 0x0200)
 					m.command = CMD_DUMMY;
 				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)

[OMPT-svn-commit] OpenMPT r21774 - trunk/OpenMPT/soundlib

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

Author: sagamusix
Date: Mon Sep 30 19:11:15 2024
New Revision: 21774
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21774

Log:
[Fix] IT: SAx import was bound to "compatible" tracker, not "made with" tracker ID.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 19:06:56 2024	(r21773)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 19:11:15 2024	(r21774)
@@ -1132,7 +1132,7 @@
 				S3MConvert(m, command, param, true);
 
 				// IT 1.xx does not support high offset command
-				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cmwt < 0x0200)
+				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cwtv < 0x0200)
 					m.command = CMD_DUMMY;
 				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)

[OMPT-svn-commit] OpenMPT r21773 - in branches/OpenMPT-1.31: . soundlib

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

Author: sagamusix
Date: Mon Sep 30 19:06:56 2024
New Revision: 21773
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21773

Log:
Merged revision(s) 21771-21772 from trunk/OpenMPT:
[Imp] IT: Don't import SAx High Offset command for IT 1.xx modules. This feature was added in IT 2.00.
........
[Fix] IT: Command fixups need to be done before the command memory is updated.
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 19:06:38 2024	(r21772)
+++ branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 19:06:56 2024	(r21773)
@@ -1027,6 +1027,7 @@
 
 		auto patData = Patterns[pat].begin();
 		ROWINDEX row = 0;
+		ModCommand dummy{};
 		while(row < numRows && patternData.CanRead(1))
 		{
 			uint8 b = patternData.ReadUint8();
@@ -1057,7 +1058,6 @@
 			}
 
 			// Now we grab the data for this particular row/channel.
-			ModCommand dummy{};
 			ModCommand &m = ch < m_nChannels ? patData[ch] : dummy;
 
 			if(chnMask[ch] & 0x10)
@@ -1138,15 +1138,21 @@
 			{
 				const auto [command, param] = patternData.ReadArray<uint8, 2>();
 				S3MConvert(m, command, param, true);
-				// In some IT-compatible trackers, it is possible to input a parameter without a command.
-				// In this case, we still need to update the last value memory. OpenMPT didn't do this until v1.25.01.07.
-				// Example: ckbounce.it
-				lastValue[ch].command = m.command;
-				lastValue[ch].param = m.param;
+
+				// IT 1.xx does not support high offset command
+				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cmwt < 0x0200)
+					m.command = CMD_DUMMY;
 				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
 				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
 					m.param = 0x80;
+
+				// In some IT-compatible trackers, it is possible to input a parameter without a command.
+				// In this case, we still need to update the last value memory (so that we don't reuse a previous non-empty effect).
+				// OpenMPT didn't do this until v1.25.01.07.
+				// Example: ckbounce.it
+				lastValue[ch].command = m.command;
+				lastValue[ch].param = m.param;
 			}
 		}
 	}

[OMPT-svn-commit] OpenMPT r21772 - trunk/OpenMPT/soundlib

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

Author: sagamusix
Date: Mon Sep 30 19:06:38 2024
New Revision: 21772
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21772

Log:
[Fix] IT: Command fixups need to be done before the command memory is updated.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 18:59:29 2024	(r21771)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 19:06:38 2024	(r21772)
@@ -1130,11 +1130,6 @@
 			{
 				const auto [command, param] = patternData.ReadArray<uint8, 2>();
 				S3MConvert(m, command, param, true);
-				// In some IT-compatible trackers, it is possible to input a parameter without a command.
-				// In this case, we still need to update the last value memory. OpenMPT didn't do this until v1.25.01.07.
-				// Example: ckbounce.it
-				lastValue[ch].command = m.command;
-				lastValue[ch].param = m.param;
 
 				// IT 1.xx does not support high offset command
 				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cmwt < 0x0200)
@@ -1143,6 +1138,13 @@
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
 				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
 					m.param = 0x80;
+
+				// In some IT-compatible trackers, it is possible to input a parameter without a command.
+				// In this case, we still need to update the last value memory (so that we don't reuse a previous non-empty effect).
+				// OpenMPT didn't do this until v1.25.01.07.
+				// Example: ckbounce.it
+				lastValue[ch].command = m.command;
+				lastValue[ch].param = m.param;
 			}
 		}
 	}

[OMPT-svn-commit] OpenMPT r21771 - trunk/OpenMPT/soundlib

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

Author: sagamusix
Date: Mon Sep 30 18:59:29 2024
New Revision: 21771
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21771

Log:
[Imp] IT: Don't import SAx High Offset command for IT 1.xx modules. This feature was added in IT 2.00.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 18:55:34 2024	(r21770)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 18:59:29 2024	(r21771)
@@ -1022,6 +1022,7 @@
 
 		auto patData = Patterns[pat].begin();
 		ROWINDEX row = 0;
+		ModCommand dummy{};
 		while(row < numRows && patternData.CanRead(1))
 		{
 			uint8 b = patternData.ReadUint8();
@@ -1052,7 +1053,6 @@
 			}
 
 			// Now we grab the data for this particular row/channel.
-			ModCommand dummy{};
 			ModCommand &m = ch < GetNumChannels() ? patData[ch] : dummy;
 
 			if(chnMask[ch] & 0x10)
@@ -1135,6 +1135,10 @@
 				// Example: ckbounce.it
 				lastValue[ch].command = m.command;
 				lastValue[ch].param = m.param;
+
+				// IT 1.xx does not support high offset command
+				if(m.command == CMD_S3MCMDEX && (m.param & 0xF0) == 0xA0 && fileHeader.cmwt < 0x0200)
+					m.command = CMD_DUMMY;
 				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
 				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
 				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)

[OMPT-svn-commit] OpenMPT r21770 - in branches/OpenMPT-1.31: . soundlib

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

Author: sagamusix
Date: Mon Sep 30 18:55:34 2024
New Revision: 21770
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21770

Log:
Merged revision(s) 21769 from trunk/OpenMPT:
[Imp] IT: Like our fix for old (Open)MPT versions, clamp the Vxx parameter to V80 for files made with old Schism Tracker versions (see https://github.com/schismtracker/schismtracker/issues/531).
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 18:55:05 2024	(r21769)
+++ branches/OpenMPT-1.31/soundlib/Load_it.cpp	Mon Sep 30 18:55:34 2024	(r21770)
@@ -1143,6 +1143,10 @@
 				// Example: ckbounce.it
 				lastValue[ch].command = m.command;
 				lastValue[ch].param = m.param;
+				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
+				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
+				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
+					m.param = 0x80;
 			}
 		}
 	}

[OMPT-svn-commit] OpenMPT r21769 - trunk/OpenMPT/soundlib

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

Author: sagamusix
Date: Mon Sep 30 18:55:05 2024
New Revision: 21769
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21769

Log:
[Imp] IT: Like our fix for old (Open)MPT versions, clamp the Vxx parameter to V80 for files made with old Schism Tracker versions (see https://github.com/schismtracker/schismtracker/issues/531).

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Sat Sep 28 21:40:25 2024	(r21768)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Mon Sep 30 18:55:05 2024	(r21769)
@@ -1135,6 +1135,10 @@
 				// Example: ckbounce.it
 				lastValue[ch].command = m.command;
 				lastValue[ch].param = m.param;
+				// Fix handling of commands V81-VFF in ITs made with old Schism Tracker versions
+				// (fixed in https://github.com/schismtracker/schismtracker/commit/ab5517d4730d4c717f7ebffb401445679bd30888 - one of the last versions to identify as v0.50)
+				if(m.command == CMD_GLOBALVOLUME && m.param > 0x80 && fileHeader.cwtv >= 0x1000 && fileHeader.cwtv <= 0x1050)
+					m.param = 0x80;
 			}
 		}
 	}