modplug-svn-commit Mailing List for modplug (Page 155)

A music tracker software for Windows.

Brought to you by: lpchip, manxorist, rewbs, saga-games

modplug-svn-commit — OpenMPT subversion commit notifications

You can subscribe to this list here.

2006	Jan	Feb	Mar (1)	Apr (1)	May	Jun (1)	Jul	Aug (10)	Sep	Oct	Nov	Dec (3)
2007	Jan (1)	Feb (2)	Mar (3)	Apr (2)	May (10)	Jun (2)	Jul (1)	Aug	Sep	Oct	Nov (3)	Dec
2008	Jan (6)	Feb (4)	Mar (5)	Apr (2)	May (1)	Jun (1)	Jul (4)	Aug (6)	Sep (2)	Oct (9)	Nov (1)	Dec (4)
2009	Jan (9)	Feb (2)	Mar (2)	Apr (2)	May (6)	Jun (18)	Jul (33)	Aug (39)	Sep (33)	Oct (24)	Nov (23)	Dec (22)
2010	Jan (29)	Feb (32)	Mar (51)	Apr (17)	May (31)	Jun (21)	Jul (32)	Aug (28)	Sep (35)	Oct (27)	Nov (11)	Dec (13)
2011	Jan (14)	Feb (13)	Mar (27)	Apr (27)	May (28)	Jun (20)	Jul (43)	Aug (52)	Sep (66)	Oct (61)	Nov (11)	Dec (8)
2012	Jan (20)	Feb (30)	Mar (38)	Apr (21)	May (33)	Jun (21)	Jul (25)	Aug (9)	Sep (24)	Oct (42)	Nov (27)	Dec (41)
2013	Jan (20)	Feb (35)	Mar (156)	Apr (298)	May (258)	Jun (201)	Jul (105)	Aug (60)	Sep (193)	Oct (245)	Nov (280)	Dec (194)
2014	Jan (63)	Feb (202)	Mar (200)	Apr (23)	May (53)	Jun (105)	Jul (18)	Aug (26)	Sep (110)	Oct (187)	Nov (97)	Dec (74)
2015	Jan (45)	Feb (55)	Mar (116)	Apr (116)	May (193)	Jun (164)	Jul (50)	Aug (111)	Sep (98)	Oct (71)	Nov (103)	Dec (63)
2016	Jan (33)	Feb (101)	Mar (182)	Apr (139)	May (140)	Jun (103)	Jul (165)	Aug (286)	Sep (208)	Oct (127)	Nov (97)	Dec (54)
2017	Jan (64)	Feb (335)	Mar (202)	Apr (212)	May (139)	Jun (127)	Jul (294)	Aug (154)	Sep (170)	Oct (152)	Nov (156)	Dec (62)
2018	Jan (168)	Feb (237)	Mar (196)	Apr (174)	May (174)	Jun (161)	Jul (127)	Aug (88)	Sep (149)	Oct (66)	Nov (52)	Dec (135)
2019	Jan (146)	Feb (126)	Mar (104)	Apr (58)	May (60)	Jun (28)	Jul (197)	Aug (129)	Sep (141)	Oct (148)	Nov (63)	Dec (100)
2020	Jan (74)	Feb (37)	Mar (59)	Apr (154)	May (194)	Jun (133)	Jul (313)	Aug (197)	Sep (49)	Oct (162)	Nov (143)	Dec (57)
2021	Jan (120)	Feb (107)	Mar (314)	Apr (157)	May (524)	Jun (169)	Jul (72)	Aug (133)	Sep (135)	Oct (146)	Nov (198)	Dec (325)
2022	Jan (409)	Feb (249)	Mar (138)	Apr (95)	May (102)	Jun (221)	Jul (66)	Aug (120)	Sep (192)	Oct (131)	Nov (53)	Dec (171)
2023	Jan (357)	Feb (82)	Mar (168)	Apr (218)	May (196)	Jun (86)	Jul (115)	Aug (49)	Sep (190)	Oct (102)	Nov (45)	Dec (76)
2024	Jan (86)	Feb (50)	Mar (324)	Apr (209)	May (197)	Jun (232)	Jul (194)	Aug (247)	Sep (219)	Oct (266)	Nov (328)	Dec (304)
2025	Jan (191)	Feb (115)	Mar (137)	Apr (32)	May (126)	Jun (403)	Jul (213)	Aug (189)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 153 154 155 156 157 .. 965 > >> (Page 155 of 965)

[OMPT-svn-commit] OpenMPT r20234 - in branches/OpenMPT-1.29: . include/mpg123 include/mpg123/src/libmpg123

From: <sv...@op...> - 2024-03-04 10:30:48

Author: manx
Date: Mon Mar  4 11:30:36 2024
New Revision: 20234
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20234

Log:
Merged revision(s) 20231 from trunk/OpenMPT:
[Fix] mpg123: Fix warning in debug builds. See <https://sourceforge.net/p/mpg123/bugs/371/>.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c

Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt	Mon Mar  4 11:30:13 2024	(r20233)
+++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt	Mon Mar  4 11:30:36 2024	(r20234)
@@ -6,6 +6,7 @@
  *  `ports/Xcode/config.h` has been modified to let the build system set
     `OPT_*`.
  *  `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`.
+ *  A warning in `src/libmpg123/readers.c` has been fixed.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.

Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:30:13 2024	(r20233)
+++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:30:36 2024	(r20234)
@@ -732,8 +732,13 @@
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
+#if 1  /* OpenMPT */
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64  /* OpenMPT */
+		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);  /* OpenMPT */
+#else  /* OpenMPT */
 		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%td"
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
+#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

[OMPT-svn-commit] OpenMPT r20233 - in branches/OpenMPT-1.30: . include/mpg123 include/mpg123/src/libmpg123

From: <sv...@op...> - 2024-03-04 10:30:26

Author: manx
Date: Mon Mar  4 11:30:13 2024
New Revision: 20233
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20233

Log:
Merged revision(s) 20231 from trunk/OpenMPT:
[Fix] mpg123: Fix warning in debug builds. See <https://sourceforge.net/p/mpg123/bugs/371/>.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c

Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt	Mon Mar  4 11:29:49 2024	(r20232)
+++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt	Mon Mar  4 11:30:13 2024	(r20233)
@@ -6,6 +6,7 @@
  *  `ports/Xcode/config.h` has been modified to let the build system set
     `OPT_*`.
  *  `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`.
+ *  A warning in `src/libmpg123/readers.c` has been fixed.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.

Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:29:49 2024	(r20232)
+++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:30:13 2024	(r20233)
@@ -732,8 +732,13 @@
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
+#if 1  /* OpenMPT */
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64  /* OpenMPT */
+		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);  /* OpenMPT */
+#else  /* OpenMPT */
 		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%td"
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
+#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

[OMPT-svn-commit] OpenMPT r20232 - in branches/OpenMPT-1.31: . include/mpg123 include/mpg123/src/libmpg123

From: <sv...@op...> - 2024-03-04 10:30:01

Author: manx
Date: Mon Mar  4 11:29:49 2024
New Revision: 20232
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20232

Log:
Merged revision(s) 20231 from trunk/OpenMPT:
[Fix] mpg123: Fix warning in debug builds. See <https://sourceforge.net/p/mpg123/bugs/371/>.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c

Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Mon Mar  4 11:29:21 2024	(r20231)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Mon Mar  4 11:29:49 2024	(r20232)
@@ -6,6 +6,7 @@
  *  `ports/Xcode/config.h` has been modified to let the build system set
     `OPT_*`.
  *  `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`.
+ *  A warning in `src/libmpg123/readers.c` has been fixed.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:29:21 2024	(r20231)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:29:49 2024	(r20232)
@@ -732,8 +732,13 @@
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
+#if 1  /* OpenMPT */
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64  /* OpenMPT */
+		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);  /* OpenMPT */
+#else  /* OpenMPT */
 		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%td"
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
+#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

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

From: <sv...@op...> - 2024-03-04 10:29:28

Author: manx
Date: Mon Mar  4 11:29:21 2024
New Revision: 20231
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20231

Log:
[Fix] mpg123: Fix warning in debug builds. See <https://sourceforge.net/p/mpg123/bugs/371/>.

Modified:
   trunk/OpenMPT/include/mpg123/OpenMPT.txt
   trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c

Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt
==============================================================================
--- trunk/OpenMPT/include/mpg123/OpenMPT.txt	Mon Mar  4 07:56:37 2024	(r20230)
+++ trunk/OpenMPT/include/mpg123/OpenMPT.txt	Mon Mar  4 11:29:21 2024	(r20231)
@@ -6,6 +6,7 @@
  *  `ports/Xcode/config.h` has been modified to let the build system set
     `OPT_*`.
  *  `ports/Xcode/config.h` has been modified to `#define HAVE_DIRENT_H`.
+ *  A warning in `src/libmpg123/readers.c` has been fixed.
  *  Modifications are marked by `// OpenMPT` or `/* OpenMPT */`.
  *  Obviously, unnecessary folders and files have been removed.
  *  For building, premake is used to generate Visual Studio project files.

Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 07:56:37 2024	(r20230)
+++ trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c	Mon Mar  4 11:29:21 2024	(r20231)
@@ -732,8 +732,13 @@
 		bc->pos  -= b->size;
 		bc->size -= b->size;
 
+#if 1  /* OpenMPT */
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64  /* OpenMPT */
+		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);  /* OpenMPT */
+#else  /* OpenMPT */
 		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%td"
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
+#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

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

From: <sv...@op...> - 2024-03-04 06:56:44

Author: manx
Date: Mon Mar  4 07:56:37 2024
New Revision: 20230
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20230

Log:
[Fix] mpt/base/utility.hpp: Call std::terminate() in std::unreachable() in standard-compliant mode.

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

Modified: trunk/OpenMPT/src/mpt/base/utility.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/utility.hpp	Mon Mar  4 07:55:37 2024	(r20229)
+++ trunk/OpenMPT/src/mpt/base/utility.hpp	Mon Mar  4 07:56:37 2024	(r20230)
@@ -13,6 +13,9 @@
 #include "mpt/base/saturate_cast.hpp"
 #endif
 
+#if MPT_CXX_BEFORE(23) && !MPT_COMPILER_MSVC && !MPT_COMPILER_GCC && !MPT_COMPILER_CLANG
+#include <exception>
+#endif
 #include <new>
 #include <type_traits>
 #include <utility>
@@ -205,7 +208,7 @@
 #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
 	__builtin_unreachable();
 #else
-	return;
+	std::terminate();
 #endif
 }

[OMPT-svn-commit] OpenMPT r20229 - branches/OpenMPT-1.28

From: <sv...@op...> - 2024-03-04 06:55:44

Author: manx
Date: Mon Mar  4 07:55:37 2024
New Revision: 20229
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20229

Log:
Merged revision(s) 20225 from trunk/OpenMPT:
[Var] Update .gitignore.
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/.gitignore

Modified: branches/OpenMPT-1.28/.gitignore
==============================================================================
--- branches/OpenMPT-1.28/.gitignore	Mon Mar  4 07:55:12 2024	(r20228)
+++ branches/OpenMPT-1.28/.gitignore	Mon Mar  4 07:55:37 2024	(r20229)
@@ -687,6 +687,7 @@
 /include/zlib/contrib/iostream
 /include/zlib/contrib/iostream2
 /include/zlib/contrib/iostream3
+/include/zlib/contrib/nuget
 /include/zlib/contrib/pascal
 /include/zlib/contrib/puff
 /include/zlib/contrib/testzlib

[OMPT-svn-commit] OpenMPT r20228 - branches/OpenMPT-1.29

From: <sv...@op...> - 2024-03-04 06:55:24

Author: manx
Date: Mon Mar  4 07:55:12 2024
New Revision: 20228
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20228

Log:
Merged revision(s) 20225 from trunk/OpenMPT:
[Var] Update .gitignore.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/.gitignore

Modified: branches/OpenMPT-1.29/.gitignore
==============================================================================
--- branches/OpenMPT-1.29/.gitignore	Mon Mar  4 07:54:52 2024	(r20227)
+++ branches/OpenMPT-1.29/.gitignore	Mon Mar  4 07:55:12 2024	(r20228)
@@ -797,6 +797,7 @@
 /include/zlib/contrib/iostream
 /include/zlib/contrib/iostream2
 /include/zlib/contrib/iostream3
+/include/zlib/contrib/nuget
 /include/zlib/contrib/pascal
 /include/zlib/contrib/puff
 /include/zlib/contrib/testzlib

[OMPT-svn-commit] OpenMPT r20227 - branches/OpenMPT-1.30

From: <sv...@op...> - 2024-03-04 06:55:04

Author: manx
Date: Mon Mar  4 07:54:52 2024
New Revision: 20227
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20227

Log:
Merged revision(s) 20225 from trunk/OpenMPT:
[Var] Update .gitignore.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/.gitignore

Modified: branches/OpenMPT-1.30/.gitignore
==============================================================================
--- branches/OpenMPT-1.30/.gitignore	Mon Mar  4 07:54:31 2024	(r20226)
+++ branches/OpenMPT-1.30/.gitignore	Mon Mar  4 07:54:52 2024	(r20227)
@@ -823,6 +823,7 @@
 /include/zlib/contrib/iostream
 /include/zlib/contrib/iostream2
 /include/zlib/contrib/iostream3
+/include/zlib/contrib/nuget
 /include/zlib/contrib/pascal
 /include/zlib/contrib/puff
 /include/zlib/contrib/testzlib

[OMPT-svn-commit] OpenMPT r20226 - branches/OpenMPT-1.31

From: <sv...@op...> - 2024-03-04 06:54:43

Author: manx
Date: Mon Mar  4 07:54:31 2024
New Revision: 20226
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20226

Log:
Merged revision(s) 20225 from trunk/OpenMPT:
[Var] Update .gitignore.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.gitignore

Modified: branches/OpenMPT-1.31/.gitignore
==============================================================================
--- branches/OpenMPT-1.31/.gitignore	Mon Mar  4 07:54:02 2024	(r20225)
+++ branches/OpenMPT-1.31/.gitignore	Mon Mar  4 07:54:31 2024	(r20226)
@@ -833,6 +833,7 @@
 /include/zlib/contrib/iostream
 /include/zlib/contrib/iostream2
 /include/zlib/contrib/iostream3
+/include/zlib/contrib/nuget
 /include/zlib/contrib/pascal
 /include/zlib/contrib/puff
 /include/zlib/contrib/testzlib

[OMPT-svn-commit] OpenMPT r20225 - trunk/OpenMPT

From: <sv...@op...> - 2024-03-04 06:54:14

Author: manx
Date: Mon Mar  4 07:54:02 2024
New Revision: 20225
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20225

Log:
[Var] Update .gitignore.

Modified:
   trunk/OpenMPT/.gitignore

Modified: trunk/OpenMPT/.gitignore
==============================================================================
--- trunk/OpenMPT/.gitignore	Sun Mar  3 19:39:16 2024	(r20224)
+++ trunk/OpenMPT/.gitignore	Mon Mar  4 07:54:02 2024	(r20225)
@@ -833,6 +833,7 @@
 /include/zlib/contrib/iostream
 /include/zlib/contrib/iostream2
 /include/zlib/contrib/iostream3
+/include/zlib/contrib/nuget
 /include/zlib/contrib/pascal
 /include/zlib/contrib/puff
 /include/zlib/contrib/testzlib

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

From: <sv...@op...> - 2024-03-03 21:05:28

Author: sagamusix
Date: Sun Mar  3 19:39:16 2024
New Revision: 20224
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20224

Log:
[New] Add two more octaves worth of note key assignments suitable for micro-tuning (https://bugs.openmpt.org/view.php?id=1727).

Modified:
   trunk/OpenMPT/mptrack/CommandSet.cpp
   trunk/OpenMPT/mptrack/CommandSet.h
   trunk/OpenMPT/mptrack/TrackerSettings.cpp
   trunk/OpenMPT/mptrack/TrackerSettings.h
   trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	Sun Mar  3 17:47:25 2024	(r20223)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	Sun Mar  3 19:39:16 2024	(r20224)
@@ -660,6 +660,32 @@
 	{1095, kcVPNoteG_2, _T("Base octave +2 G")},
 	{1096, kcVPNoteGS2, _T("Base octave +2 G#")},
 	{1097, kcVPNoteA_3, _T("Base octave +2 A")},
+	{2070, kcVPNoteAS3, _T("Base octave +2 A#")},
+	{2071, kcVPNoteB_3, _T("Base octave +2 B")},
+	{2072, kcVPNoteC_3, _T("Base octave +3 C")},
+	{2073, kcVPNoteCS3, _T("Base octave +3 C#")},
+	{2074, kcVPNoteD_3, _T("Base octave +3 D")},
+	{2075, kcVPNoteDS3, _T("Base octave +3 D#")},
+	{2076, kcVPNoteE_3, _T("Base octave +3 E")},
+	{2077, kcVPNoteF_3, _T("Base octave +3 F")},
+	{2078, kcVPNoteFS3, _T("Base octave +3 F#")},
+	{2079, kcVPNoteG_3, _T("Base octave +3 G")},
+	{2080, kcVPNoteGS3, _T("Base octave +3 G#")},
+	{2081, kcVPNoteA_4, _T("Base octave +3 A")},
+	{2082, kcVPNoteAS4, _T("Base octave +3 A#")},
+	{2083, kcVPNoteB_4, _T("Base octave +3 B")},
+	{2084, kcVPNoteC_4, _T("Base octave +4 C")},
+	{2085, kcVPNoteCS4, _T("Base octave +4 C#")},
+	{2086, kcVPNoteD_4, _T("Base octave +4 D")},
+	{2087, kcVPNoteDS4, _T("Base octave +4 D#")},
+	{2088, kcVPNoteE_4, _T("Base octave +4 E")},
+	{2089, kcVPNoteF_4, _T("Base octave +4 F")},
+	{2090, kcVPNoteFS4, _T("Base octave +4 F#")},
+	{2091, kcVPNoteG_4, _T("Base octave +4 G")},
+	{2092, kcVPNoteGS4, _T("Base octave +4 G#")},
+	{2093, kcVPNoteA_5, _T("Base octave +4 A")},
+	{2094, kcVPNoteAS5, _T("Base octave +4 A#")},
+	{2095, kcVPNoteB_5, _T("Base octave +4 B")},
 	{KeyCommand::Hidden, kcVPNoteStopC_0, _T("Stop base octave C")},
 	{KeyCommand::Hidden, kcVPNoteStopCS0, _T("Stop base octave C#")},
 	{KeyCommand::Hidden, kcVPNoteStopD_0, _T("Stop base octave D")},
@@ -669,9 +695,9 @@
 	{KeyCommand::Hidden, kcVPNoteStopFS0, _T("Stop base octave F#")},
 	{KeyCommand::Hidden, kcVPNoteStopG_0, _T("Stop base octave G")},
 	{KeyCommand::Hidden, kcVPNoteStopGS0, _T("Stop base octave G#")},
-	{KeyCommand::Hidden, kcVPNoteStopA_1, _T("Stop base octave +1 A")},
-	{KeyCommand::Hidden, kcVPNoteStopAS1, _T("Stop base octave +1 A#")},
-	{KeyCommand::Hidden, kcVPNoteStopB_1, _T("Stop base octave +1 B")},
+	{KeyCommand::Hidden, kcVPNoteStopA_1, _T("Stop base octave A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS1, _T("Stop base octave A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_1, _T("Stop base octave B")},
 	{KeyCommand::Hidden, kcVPNoteStopC_1, _T("Stop base octave +1 C")},
 	{KeyCommand::Hidden, kcVPNoteStopCS1, _T("Stop base octave +1 C#")},
 	{KeyCommand::Hidden, kcVPNoteStopD_1, _T("Stop base octave +1 D")},
@@ -681,9 +707,9 @@
 	{KeyCommand::Hidden, kcVPNoteStopFS1, _T("Stop base octave +1 F#")},
 	{KeyCommand::Hidden, kcVPNoteStopG_1, _T("Stop base octave +1 G")},
 	{KeyCommand::Hidden, kcVPNoteStopGS1, _T("Stop base octave +1 G#")},
-	{KeyCommand::Hidden, kcVPNoteStopA_2, _T("Stop base octave +2 A")},
-	{KeyCommand::Hidden, kcVPNoteStopAS2, _T("Stop base octave +2 A#")},
-	{KeyCommand::Hidden, kcVPNoteStopB_2, _T("Stop base octave +2 B")},
+	{KeyCommand::Hidden, kcVPNoteStopA_2, _T("Stop base octave +1 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS2, _T("Stop base octave +1 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_2, _T("Stop base octave +1 B")},
 	{KeyCommand::Hidden, kcVPNoteStopC_2, _T("Stop base octave +2 C")},
 	{KeyCommand::Hidden, kcVPNoteStopCS2, _T("Stop base octave +2 C#")},
 	{KeyCommand::Hidden, kcVPNoteStopD_2, _T("Stop base octave +2 D")},
@@ -693,7 +719,33 @@
 	{KeyCommand::Hidden, kcVPNoteStopFS2, _T("Stop base octave +2 F#")},
 	{KeyCommand::Hidden, kcVPNoteStopG_2, _T("Stop base octave +2 G")},
 	{KeyCommand::Hidden, kcVPNoteStopGS2, _T("Stop base octave +2 G#")},
-	{KeyCommand::Hidden, kcVPNoteStopA_3, _T("Stop base octave +3 A")},
+	{KeyCommand::Hidden, kcVPNoteStopA_3, _T("Stop base octave +2 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS3, _T("Stop base octave +2 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_3, _T("Stop base octave +2 B")},
+	{KeyCommand::Hidden, kcVPNoteStopC_3, _T("Stop base octave +3 C")},
+	{KeyCommand::Hidden, kcVPNoteStopCS3, _T("Stop base octave +3 C#")},
+	{KeyCommand::Hidden, kcVPNoteStopD_3, _T("Stop base octave +3 D")},
+	{KeyCommand::Hidden, kcVPNoteStopDS3, _T("Stop base octave +3 D#")},
+	{KeyCommand::Hidden, kcVPNoteStopE_3, _T("Stop base octave +3 E")},
+	{KeyCommand::Hidden, kcVPNoteStopF_3, _T("Stop base octave +3 F")},
+	{KeyCommand::Hidden, kcVPNoteStopFS3, _T("Stop base octave +3 F#")},
+	{KeyCommand::Hidden, kcVPNoteStopG_3, _T("Stop base octave +3 G")},
+	{KeyCommand::Hidden, kcVPNoteStopGS3, _T("Stop base octave +3 G#")},
+	{KeyCommand::Hidden, kcVPNoteStopA_4, _T("Stop base octave +3 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS4, _T("Stop base octave +3 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_4, _T("Stop base octave +3 B")},
+	{KeyCommand::Hidden, kcVPNoteStopC_4, _T("Stop base octave +4 C")},
+	{KeyCommand::Hidden, kcVPNoteStopCS4, _T("Stop base octave +4 C#")},
+	{KeyCommand::Hidden, kcVPNoteStopD_4, _T("Stop base octave +4 D")},
+	{KeyCommand::Hidden, kcVPNoteStopDS4, _T("Stop base octave +4 D#")},
+	{KeyCommand::Hidden, kcVPNoteStopE_4, _T("Stop base octave +4 E")},
+	{KeyCommand::Hidden, kcVPNoteStopF_4, _T("Stop base octave +4 F")},
+	{KeyCommand::Hidden, kcVPNoteStopFS4, _T("Stop base octave +4 F#")},
+	{KeyCommand::Hidden, kcVPNoteStopG_4, _T("Stop base octave +4 G")},
+	{KeyCommand::Hidden, kcVPNoteStopGS4, _T("Stop base octave +4 G#")},
+	{KeyCommand::Hidden, kcVPNoteStopA_5, _T("Stop base octave +4 A")},
+	{KeyCommand::Hidden, kcVPNoteStopAS5, _T("Stop base octave +4 A#")},
+	{KeyCommand::Hidden, kcVPNoteStopB_5, _T("Stop base octave +4 B")},
 	{KeyCommand::Hidden, kcVPChordC_0, _T("Base octave chord C")},
 	{KeyCommand::Hidden, kcVPChordCS0, _T("Base octave chord C#")},
 	{KeyCommand::Hidden, kcVPChordD_0, _T("Base octave chord D")},
@@ -703,9 +755,9 @@
 	{KeyCommand::Hidden, kcVPChordFS0, _T("Base octave chord F#")},
 	{KeyCommand::Hidden, kcVPChordG_0, _T("Base octave chord G")},
 	{KeyCommand::Hidden, kcVPChordGS0, _T("Base octave chord G#")},
-	{KeyCommand::Hidden, kcVPChordA_1, _T("Base octave +1 chord A")},
-	{KeyCommand::Hidden, kcVPChordAS1, _T("Base octave +1 chord A#")},
-	{KeyCommand::Hidden, kcVPChordB_1, _T("Base octave +1 chord B")},
+	{KeyCommand::Hidden, kcVPChordA_1, _T("Base octave chord A")},
+	{KeyCommand::Hidden, kcVPChordAS1, _T("Base octave chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_1, _T("Base octave chord B")},
 	{KeyCommand::Hidden, kcVPChordC_1, _T("Base octave +1 chord C")},
 	{KeyCommand::Hidden, kcVPChordCS1, _T("Base octave +1 chord C#")},
 	{KeyCommand::Hidden, kcVPChordD_1, _T("Base octave +1 chord D")},
@@ -715,9 +767,9 @@
 	{KeyCommand::Hidden, kcVPChordFS1, _T("Base octave +1 chord F#")},
 	{KeyCommand::Hidden, kcVPChordG_1, _T("Base octave +1 chord G")},
 	{KeyCommand::Hidden, kcVPChordGS1, _T("Base octave +1 chord G#")},
-	{KeyCommand::Hidden, kcVPChordA_2, _T("Base octave +2 chord A")},
-	{KeyCommand::Hidden, kcVPChordAS2, _T("Base octave +2 chord A#")},
-	{KeyCommand::Hidden, kcVPChordB_2, _T("Base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordA_2, _T("Base octave +1 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS2, _T("Base octave +1 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_2, _T("Base octave +1 chord B")},
 	{KeyCommand::Hidden, kcVPChordC_2, _T("Base octave +2 chord C")},
 	{KeyCommand::Hidden, kcVPChordCS2, _T("Base octave +2 chord C#")},
 	{KeyCommand::Hidden, kcVPChordD_2, _T("Base octave +2 chord D")},
@@ -727,7 +779,33 @@
 	{KeyCommand::Hidden, kcVPChordFS2, _T("Base octave +2 chord F#")},
 	{KeyCommand::Hidden, kcVPChordG_2, _T("Base octave +2 chord G")},
 	{KeyCommand::Hidden, kcVPChordGS2, _T("Base octave +2 chord G#")},
-	{KeyCommand::Hidden, kcVPChordA_3, _T("Base octave chord +3 A")},
+	{KeyCommand::Hidden, kcVPChordA_3, _T("Base octave +2 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS3, _T("Base octave +2 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_3, _T("Base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordC_3, _T("Base octave +3 chord C")},
+	{KeyCommand::Hidden, kcVPChordCS3, _T("Base octave +3 chord C#")},
+	{KeyCommand::Hidden, kcVPChordD_3, _T("Base octave +3 chord D")},
+	{KeyCommand::Hidden, kcVPChordDS3, _T("Base octave +3 chord D#")},
+	{KeyCommand::Hidden, kcVPChordE_3, _T("Base octave +3 chord E")},
+	{KeyCommand::Hidden, kcVPChordF_3, _T("Base octave +3 chord F")},
+	{KeyCommand::Hidden, kcVPChordFS3, _T("Base octave +3 chord F#")},
+	{KeyCommand::Hidden, kcVPChordG_3, _T("Base octave +3 chord G")},
+	{KeyCommand::Hidden, kcVPChordGS3, _T("Base octave +3 chord G#")},
+	{KeyCommand::Hidden, kcVPChordA_4, _T("Base octave +3 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS4, _T("Base octave +3 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_4, _T("Base octave +3 chord B")},
+	{KeyCommand::Hidden, kcVPChordC_4, _T("Base octave +4 chord C")},
+	{KeyCommand::Hidden, kcVPChordCS4, _T("Base octave +4 chord C#")},
+	{KeyCommand::Hidden, kcVPChordD_4, _T("Base octave +4 chord D")},
+	{KeyCommand::Hidden, kcVPChordDS4, _T("Base octave +4 chord D#")},
+	{KeyCommand::Hidden, kcVPChordE_4, _T("Base octave +4 chord E")},
+	{KeyCommand::Hidden, kcVPChordF_4, _T("Base octave +4 chord F")},
+	{KeyCommand::Hidden, kcVPChordFS4, _T("Base octave +4 chord F#")},
+	{KeyCommand::Hidden, kcVPChordG_4, _T("Base octave +4 chord G")},
+	{KeyCommand::Hidden, kcVPChordGS4, _T("Base octave +4 chord G#")},
+	{KeyCommand::Hidden, kcVPChordA_5, _T("Base octave +4 chord A")},
+	{KeyCommand::Hidden, kcVPChordAS5, _T("Base octave +4 chord A#")},
+	{KeyCommand::Hidden, kcVPChordB_5, _T("Base octave +4 chord B")},
 	{KeyCommand::Hidden, kcVPChordStopC_0, _T("Stop base octave chord C")},
 	{KeyCommand::Hidden, kcVPChordStopCS0, _T("Stop base octave chord C#")},
 	{KeyCommand::Hidden, kcVPChordStopD_0, _T("Stop base octave chord D")},
@@ -737,9 +815,9 @@
 	{KeyCommand::Hidden, kcVPChordStopFS0, _T("Stop base octave chord F#")},
 	{KeyCommand::Hidden, kcVPChordStopG_0, _T("Stop base octave chord G")},
 	{KeyCommand::Hidden, kcVPChordStopGS0, _T("Stop base octave chord G#")},
-	{KeyCommand::Hidden, kcVPChordStopA_1, _T("Stop base octave +1 chord A")},
-	{KeyCommand::Hidden, kcVPChordStopAS1, _T("Stop base octave +1 chord A#")},
-	{KeyCommand::Hidden, kcVPChordStopB_1, _T("Stop base octave +1 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopA_1, _T("Stop base octave chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS1, _T("Stop base octave chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_1, _T("Stop base octave chord B")},
 	{KeyCommand::Hidden, kcVPChordStopC_1, _T("Stop base octave +1 chord C")},
 	{KeyCommand::Hidden, kcVPChordStopCS1, _T("Stop base octave +1 chord C#")},
 	{KeyCommand::Hidden, kcVPChordStopD_1, _T("Stop base octave +1 chord D")},
@@ -749,9 +827,9 @@
 	{KeyCommand::Hidden, kcVPChordStopFS1, _T("Stop base octave +1 chord F#")},
 	{KeyCommand::Hidden, kcVPChordStopG_1, _T("Stop base octave +1 chord G")},
 	{KeyCommand::Hidden, kcVPChordStopGS1, _T("Stop base octave +1 chord G#")},
-	{KeyCommand::Hidden, kcVPChordStopA_2, _T("Stop base octave +2 chord A")},
-	{KeyCommand::Hidden, kcVPChordStopAS2, _T("Stop base octave +2 chord A#")},
-	{KeyCommand::Hidden, kcVPChordStopB_2, _T("Stop base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopA_2, _T("Stop base octave +1 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS2, _T("Stop base octave +1 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_2, _T("Stop base octave +1 chord B")},
 	{KeyCommand::Hidden, kcVPChordStopC_2, _T("Stop base octave +2 chord C")},
 	{KeyCommand::Hidden, kcVPChordStopCS2, _T("Stop base octave +2 chord C#")},
 	{KeyCommand::Hidden, kcVPChordStopD_2, _T("Stop base octave +2 chord D")},
@@ -761,7 +839,33 @@
 	{KeyCommand::Hidden, kcVPChordStopFS2, _T("Stop base octave +2 chord F#")},
 	{KeyCommand::Hidden, kcVPChordStopG_2, _T("Stop base octave +2 chord G")},
 	{KeyCommand::Hidden, kcVPChordStopGS2, _T("Stop base octave +2 chord G#")},
-	{KeyCommand::Hidden, kcVPChordStopA_3, _T("Stop base octave +3 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopA_3, _T("Stop base octave +2 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS3, _T("Stop base octave +2 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_3, _T("Stop base octave +2 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopC_3, _T("Stop base octave +3 chord C")},
+	{KeyCommand::Hidden, kcVPChordStopCS3, _T("Stop base octave +3 chord C#")},
+	{KeyCommand::Hidden, kcVPChordStopD_3, _T("Stop base octave +3 chord D")},
+	{KeyCommand::Hidden, kcVPChordStopDS3, _T("Stop base octave +3 chord D#")},
+	{KeyCommand::Hidden, kcVPChordStopE_3, _T("Stop base octave +3 chord E")},
+	{KeyCommand::Hidden, kcVPChordStopF_3, _T("Stop base octave +3 chord F")},
+	{KeyCommand::Hidden, kcVPChordStopFS3, _T("Stop base octave +3 chord F#")},
+	{KeyCommand::Hidden, kcVPChordStopG_3, _T("Stop base octave +3 chord G")},
+	{KeyCommand::Hidden, kcVPChordStopGS3, _T("Stop base octave +3 chord G#")},
+	{KeyCommand::Hidden, kcVPChordStopA_4, _T("Stop base octave +3 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS4, _T("Stop base octave +3 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_4, _T("Stop base octave +3 chord B")},
+	{KeyCommand::Hidden, kcVPChordStopC_4, _T("Stop base octave +4 chord C")},
+	{KeyCommand::Hidden, kcVPChordStopCS4, _T("Stop base octave +4 chord C#")},
+	{KeyCommand::Hidden, kcVPChordStopD_4, _T("Stop base octave +4 chord D")},
+	{KeyCommand::Hidden, kcVPChordStopDS4, _T("Stop base octave +4 chord D#")},
+	{KeyCommand::Hidden, kcVPChordStopE_4, _T("Stop base octave +4 chord E")},
+	{KeyCommand::Hidden, kcVPChordStopF_4, _T("Stop base octave +4 chord F")},
+	{KeyCommand::Hidden, kcVPChordStopFS4, _T("Stop base octave +4 chord F#")},
+	{KeyCommand::Hidden, kcVPChordStopG_4, _T("Stop base octave +4 chord G")},
+	{KeyCommand::Hidden, kcVPChordStopGS4, _T("Stop base octave +4 chord G#")},
+	{KeyCommand::Hidden, kcVPChordStopA_5, _T("Stop base octave +4 chord A")},
+	{KeyCommand::Hidden, kcVPChordStopAS5, _T("Stop base octave +4 chord A#")},
+	{KeyCommand::Hidden, kcVPChordStopB_5, _T("Stop base octave +4 chord B")},
 	{1200, kcNoteCut, _T("Note Cut")},
 	{1201, kcNoteOff, _T("Note Off")},
 	{1202, kcSetIns0, _T("Set instrument digit 0")},

Modified: trunk/OpenMPT/mptrack/CommandSet.h
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h	Sun Mar  3 17:47:25 2024	(r20223)
+++ trunk/OpenMPT/mptrack/CommandSet.h	Sun Mar  3 19:39:16 2024	(r20224)
@@ -65,7 +65,7 @@
 
 enum CommandID
 {
-	kcCommandSetNumNotes = 33,  // kcVPEndNotes - kcVPStartNotes
+	kcCommandSetNumNotes = 59,  // kcVPEndNotes - kcVPStartNotes
 
 	kcNull = -1,
 	kcFirst,
@@ -441,7 +441,33 @@
 	kcVPNoteG_2,
 	kcVPNoteGS2,
 	kcVPNoteA_3,
-	kcVPEndNotes = kcVPNoteA_3,
+	kcVPNoteAS3,
+	kcVPNoteB_3,
+	kcVPNoteC_3,
+	kcVPNoteCS3,
+	kcVPNoteD_3,
+	kcVPNoteDS3,
+	kcVPNoteE_3,
+	kcVPNoteF_3,
+	kcVPNoteFS3,
+	kcVPNoteG_3,
+	kcVPNoteGS3,
+	kcVPNoteA_4,
+	kcVPNoteAS4,
+	kcVPNoteB_4,
+	kcVPNoteC_4,
+	kcVPNoteCS4,
+	kcVPNoteD_4,
+	kcVPNoteDS4,
+	kcVPNoteE_4,
+	kcVPNoteF_4,
+	kcVPNoteFS4,
+	kcVPNoteG_4,
+	kcVPNoteGS4,
+	kcVPNoteA_5,
+	kcVPNoteAS5,
+	kcVPNoteB_5,
+	kcVPEndNotes = kcVPNoteB_5,
 
 	//Note stops
 	kcVPStartNoteStops,
@@ -479,7 +505,33 @@
 	kcVPNoteStopG_2,
 	kcVPNoteStopGS2,
 	kcVPNoteStopA_3,
-	kcVPEndNoteStops = kcVPNoteStopA_3,
+	kcVPNoteStopAS3,
+	kcVPNoteStopB_3,
+	kcVPNoteStopC_3,
+	kcVPNoteStopCS3,
+	kcVPNoteStopD_3,
+	kcVPNoteStopDS3,
+	kcVPNoteStopE_3,
+	kcVPNoteStopF_3,
+	kcVPNoteStopFS3,
+	kcVPNoteStopG_3,
+	kcVPNoteStopGS3,
+	kcVPNoteStopA_4,
+	kcVPNoteStopAS4,
+	kcVPNoteStopB_4,
+	kcVPNoteStopC_4,
+	kcVPNoteStopCS4,
+	kcVPNoteStopD_4,
+	kcVPNoteStopDS4,
+	kcVPNoteStopE_4,
+	kcVPNoteStopF_4,
+	kcVPNoteStopFS4,
+	kcVPNoteStopG_4,
+	kcVPNoteStopGS4,
+	kcVPNoteStopA_5,
+	kcVPNoteStopAS5,
+	kcVPNoteStopB_5,
+	kcVPEndNoteStops = kcVPNoteStopB_5,
 
 	//Chords
 	kcVPStartChords,
@@ -517,7 +569,33 @@
 	kcVPChordG_2,
 	kcVPChordGS2,
 	kcVPChordA_3,
-	kcVPEndChords = kcVPChordA_3,
+	kcVPChordAS3,
+	kcVPChordB_3,
+	kcVPChordC_3,
+	kcVPChordCS3,
+	kcVPChordD_3,
+	kcVPChordDS3,
+	kcVPChordE_3,
+	kcVPChordF_3,
+	kcVPChordFS3,
+	kcVPChordG_3,
+	kcVPChordGS3,
+	kcVPChordA_4,
+	kcVPChordAS4,
+	kcVPChordB_4,
+	kcVPChordC_4,
+	kcVPChordCS4,
+	kcVPChordD_4,
+	kcVPChordDS4,
+	kcVPChordE_4,
+	kcVPChordF_4,
+	kcVPChordFS4,
+	kcVPChordG_4,
+	kcVPChordGS4,
+	kcVPChordA_5,
+	kcVPChordAS5,
+	kcVPChordB_5,
+	kcVPEndChords = kcVPChordA_5,
 
 	//Chord Stops
 	kcVPStartChordStops,
@@ -555,7 +633,33 @@
 	kcVPChordStopG_2,
 	kcVPChordStopGS2,
 	kcVPChordStopA_3,
-	kcVPEndChordStops = kcVPChordStopA_3,
+	kcVPChordStopAS3,
+	kcVPChordStopB_3,
+	kcVPChordStopC_3,
+	kcVPChordStopCS3,
+	kcVPChordStopD_3,
+	kcVPChordStopDS3,
+	kcVPChordStopE_3,
+	kcVPChordStopF_3,
+	kcVPChordStopFS3,
+	kcVPChordStopG_3,
+	kcVPChordStopGS3,
+	kcVPChordStopA_4,
+	kcVPChordStopAS4,
+	kcVPChordStopB_4,
+	kcVPChordStopC_4,
+	kcVPChordStopCS4,
+	kcVPChordStopD_4,
+	kcVPChordStopDS4,
+	kcVPChordStopE_4,
+	kcVPChordStopF_4,
+	kcVPChordStopFS4,
+	kcVPChordStopG_4,
+	kcVPChordStopGS4,
+	kcVPChordStopA_5,
+	kcVPChordStopAS5,
+	kcVPChordStopB_5,
+	kcVPEndChordStops = kcVPChordStopB_5,
 
 	//Set octave from note column
 	kcSetOctave0,

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	Sun Mar  3 17:47:25 2024	(r20223)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	Sun Mar  3 19:39:16 2024	(r20224)
@@ -404,26 +404,26 @@
 	// init old and messy stuff:
 
 	// Default chords
-	MemsetZero(Chords);
-	for(UINT ichord = 0; ichord < 3 * 12; ichord++)
+	for(size_t i = 0; i < Chords.size(); i++)
 	{
-		Chords[ichord].key = (uint8)ichord;
-		Chords[ichord].notes[0] = MPTChord::noNote;
-		Chords[ichord].notes[1] = MPTChord::noNote;
-		Chords[ichord].notes[2] = MPTChord::noNote;
+		mpt::reset(Chords[i]);
+		Chords[i].key = static_cast<uint8>(i);
+		Chords[i].notes[0] = MPTChord::noNote;
+		Chords[i].notes[1] = MPTChord::noNote;
+		Chords[i].notes[2] = MPTChord::noNote;
 
-		if(ichord < 12)
+		if(i < 12)
 		{
 			// Major Chords
-			Chords[ichord].notes[0] = (int8)(ichord + 4);
-			Chords[ichord].notes[1] = (int8)(ichord + 7);
-			Chords[ichord].notes[2] = (int8)(ichord + 10);
-		} else if(ichord < 24)
+			Chords[i].notes[0] = static_cast<int8>(i + 4);
+			Chords[i].notes[1] = static_cast<int8>(i + 7);
+			Chords[i].notes[2] = static_cast<int8>(i + 10);
+		} else if(i < 24)
 		{
 			// Minor Chords
-			Chords[ichord].notes[0] = (int8)(ichord - 9);
-			Chords[ichord].notes[1] = (int8)(ichord - 5);
-			Chords[ichord].notes[2] = (int8)(ichord - 2);
+			Chords[i].notes[0] = static_cast<int8>(i - 9);
+			Chords[i].notes[1] = static_cast<int8>(i - 5);
+			Chords[i].notes[2] = static_cast<int8>(i - 2);
 		}
 	}
 
@@ -1406,7 +1406,7 @@
 
 void TrackerSettings::LoadChords(MPTChords &chords)
 {
-	for(std::size_t i = 0; i < std::size(chords); i++)
+	for(std::size_t i = 0; i < chords.size(); i++)
 	{
 		uint32 chord;
 		mpt::ustring noteName = MPT_UFORMAT("{}{}")(mpt::ustring(NoteNamesSharp[i % 12]), i / 12);
@@ -1435,7 +1435,7 @@
 
 void TrackerSettings::SaveChords(MPTChords &chords)
 {
-	for(std::size_t i = 0; i < std::size(chords); i++)
+	for(std::size_t i = 0; i < chords.size(); i++)
 	{
 		auto notes = chords[i].notes;
 		for(auto &note : notes)

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	Sun Mar  3 17:47:25 2024	(r20223)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	Sun Mar  3 19:39:16 2024	(r20224)
@@ -209,7 +209,7 @@
 	std::array<NoteType, notesPerChord - 1> notes;  // Additional chord notes
 };
 
-using MPTChords = std::array<MPTChord, 3 * 12>;	// 3 octaves
+using MPTChords = std::array<MPTChord, 60>;  // Size == kcCommandSetNumNotes
 
 // MIDI recording
 enum RecordAftertouchOptions

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	Sun Mar  3 17:47:25 2024	(r20223)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	Sun Mar  3 19:39:16 2024	(r20224)
@@ -5763,6 +5763,7 @@
 {
 	const MPTChords &chords = TrackerSettings::GetChords();
 	UINT chordNum = note - GetBaseNote();
+	static_assert(mpt::extent<decltype(chords)>() == kcCommandSetNumNotes + 1);
 
 	if(chordNum >= chords.size())
 	{

[OMPT-svn-commit] OpenMPT r20223 - trunk/OpenMPT/common

From: <sv...@op...> - 2024-03-03 16:47:37

Author: sagamusix
Date: Sun Mar  3 17:47:25 2024
New Revision: 20223
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20223

Log:
[Mod] OpenMPT: Version is now 1.32.00.07

Modified:
   trunk/OpenMPT/common/versionNumber.h

Modified: trunk/OpenMPT/common/versionNumber.h
==============================================================================
--- trunk/OpenMPT/common/versionNumber.h	Sun Mar  3 17:45:38 2024	(r20222)
+++ trunk/OpenMPT/common/versionNumber.h	Sun Mar  3 17:47:25 2024	(r20223)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      32
 #define VER_MINOR      00
-#define VER_MINORMINOR 06
+#define VER_MINORMINOR 07
 
 OPENMPT_NAMESPACE_END

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

From: <sv...@op...> - 2024-03-03 16:45:50

Author: sagamusix
Date: Sun Mar  3 17:45:38 2024
New Revision: 20222
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20222

Log:
[New] Pattern tab: Merge functionality has been extended to support merging into multiple patterns with a user-defined length. This way, it becomes possible to automatically rearrange e.g. 64-row patterns into 128-row patterns without having to manually go through all pairs of 64-row patterns (https://bugs.openmpt.org/view.php?id=1750).

Modified:
   trunk/OpenMPT/mptrack/Ctrl_pat.cpp
   trunk/OpenMPT/soundlib/patternContainer.cpp
   trunk/OpenMPT/soundlib/patternContainer.h

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	Sun Mar  3 17:33:22 2024	(r20221)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	Sun Mar  3 17:45:38 2024	(r20222)
@@ -882,63 +882,115 @@
 	const ORDERINDEX numOrders = selection.GetSelCount();
 
 	// Get the total number of lines to be merged
-	ROWINDEX numRows = 0u;
+	std::vector<ModCommand> originalData;
+	ROWINDEX numRows = 0, minPatternSize = MAX_PATTERN_ROWS, maxPatternSize = 0;
 	ModSequence &order = Order();
-	for(ORDERINDEX i = 0; i < numOrders; i++)
+	for(ORDERINDEX ord = selection.firstOrd; ord <= selection.lastOrd; ord++)
 	{
-		PATTERNINDEX pat = order[firstOrder + i];
-		if(m_sndFile.Patterns.IsValidPat(pat))
-			numRows += m_sndFile.Patterns[pat].GetNumRows();
+		const CPattern *pattern = order.PatternAt(ord);
+		if(!pattern)
+			continue;
+		numRows += pattern->GetNumRows();
+		minPatternSize = std::min(minPatternSize, pattern->GetNumRows());
+		maxPatternSize = std::max(maxPatternSize, pattern->GetNumRows());
+		originalData.insert(originalData.end(), pattern->cbegin(), pattern->cend());
 	}
-	if(!numRows || numOrders < 2)
+	if(!numRows || !numOrders)
 	{
 		MessageBeep(MB_ICONWARNING);
 		SwitchToView();
 		return;
 	}
 
-	// Try to create a new pattern for the merge
 	const auto &specs = m_sndFile.GetModSpecifications();
 	const mpt::ustring format = specs.GetFileExtensionUpper();
-	if(numRows > specs.patternRowsMax)
+
+	const ORDERINDEX remainingOrders = order.GetRemainingCapacity(selection.lastOrd + 1) + numOrders;
+	ROWINDEX minRows = (numRows + (remainingOrders - 1)) / remainingOrders;
+	if(minRows > specs.patternRowsMax)
 	{
-		Reporting::Error(MPT_UFORMAT("Merged pattern size ({} rows) exceeds the row limit ({} rows) of the {} format.")(numRows, specs.patternRowsMax, format), U_("Merge Patterns"));
+		Reporting::Error(U_("There are not enough empty orders left to merge the selected patterns into."), U_("Merge Patterns"));
 		SwitchToView();
 		return;
 	}
 
-	CriticalSection cs;
-	const PATTERNINDEX newPat = m_sndFile.Patterns.InsertAny(std::max(numRows, specs.patternRowsMin), true);
-	if(newPat == PATTERNINDEX_INVALID)
+	const PATTERNINDEX remainingPatterns = m_sndFile.Patterns.GetRemainingCapacity();
+	if(!remainingPatterns)
 	{
-		cs.Leave();
 		Reporting::Error(MPT_UFORMAT("Pattern limit of the {} format ({} patterns) has been reached.")(format, specs.patternsMax), U_("Merge Patterns"));
 		SwitchToView();
 		return;
 	}
+	minRows = std::max(minRows, (numRows + (remainingPatterns - 1)) / remainingPatterns);
+	if(minRows > specs.patternRowsMax)
+	{
+		Reporting::Error(U_("There are not enough empty patterns left to merge the selected patterns into."), U_("Merge Patterns"));
+		SwitchToView();
+		return;
+	}
 
-	auto &pattern = m_sndFile.Patterns[newPat];
-	auto it = pattern.begin();
-	for(ORDERINDEX i = 0; i < numOrders; i++)
+	ROWINDEX patternSize = minRows;
+	if(minRows != specs.patternRowsMax)
 	{
-		PATTERNINDEX pat = order[firstOrder + i];
-		if(m_sndFile.Patterns.IsValidPat(pat))
-			it = std::copy(m_sndFile.Patterns[pat].begin(), m_sndFile.Patterns[pat].end(), it);
+		CInputDlg dlg(this, _T("New pattern length:"), static_cast<int32>(minRows), static_cast<int32>(specs.patternRowsMax), static_cast<int32>(std::clamp(numRows, minRows, specs.patternRowsMax)));
+		if(dlg.DoModal() != IDOK)
+		{
+			SwitchToView();
+			return;
+		}
+		patternSize = static_cast<ROWINDEX>(dlg.resultAsInt);
+	} else if(minPatternSize == maxPatternSize && minPatternSize == patternSize)
+	{
+		MessageBeep(MB_ICONWARNING);
+		SwitchToView();
+		return;
 	}
 
-	if(pattern.GetNumRows() > numRows)
-		pattern.WriteEffect(EffectWriter(CMD_PATTERNBREAK, 0).Row(numRows - 1).RetryNextRow());
+	CriticalSection cs;
+
+	const PATTERNINDEX patternsRequired = static_cast<PATTERNINDEX>((numRows + (patternSize - 1)) / patternSize);
+	// Double-check if we *still* have enough patterns and orders (right now it should not be possible that this number changed, but in the future it might due to scripting / etc.)
+	if(m_sndFile.Patterns.GetRemainingCapacity() < patternsRequired || (order.GetRemainingCapacity(selection.lastOrd + 1) + numOrders) < patternsRequired)
+	{
+		cs.Leave();
+		Reporting::Error(U_("There are not enough empty patterns or order lists for this operation."), U_("Merge Patterns"));
+		SwitchToView();
+		return;
+	}
 
-	// Remove the merged patterns...
 	order.Remove(selection.firstOrd, selection.lastOrd);
 	m_OrderList.DeleteUpdatePlaystate(selection.firstOrd, selection.lastOrd);
-	// ...and insert the new one
-	order.insert(firstOrder, 1, newPat);
-	m_OrderList.InsertUpdatePlaystate(firstOrder, firstOrder);
+
+	order.insert(firstOrder, patternsRequired, PATTERNINDEX_INVALID);
+	m_OrderList.InsertUpdatePlaystate(firstOrder, firstOrder + patternsRequired);
+
+	PATTERNINDEX patternsInserted = 0;
+	auto sourceData = originalData.cbegin();
+	while(sourceData != originalData.end())
+	{
+		const ROWINDEX thisPatternSize = std::min(numRows, patternSize);
+
+		const PATTERNINDEX newPat = m_sndFile.Patterns.InsertAny(std::max(thisPatternSize, specs.patternRowsMin), true);
+		if(newPat == PATTERNINDEX_INVALID)
+			break;
+
+		auto &pattern = m_sndFile.Patterns[newPat];
+		auto sourceEnd = sourceData + thisPatternSize * m_sndFile.GetNumChannels();
+		std::copy(sourceData, sourceEnd, pattern.begin());
+		sourceData = sourceEnd;
+
+		if(pattern.GetNumRows() > thisPatternSize)
+			pattern.WriteEffect(EffectWriter(CMD_PATTERNBREAK, 0).Row(thisPatternSize - 1).RetryNextRow());
+
+		order[firstOrder + patternsInserted] = newPat;
+
+		numRows -= thisPatternSize;
+		patternsInserted++;
+	}
 
 	m_OrderList.Invalidate(FALSE);
-	m_OrderList.SetSelection(firstOrder);
-	SetCurrentPattern(newPat);
+	m_OrderList.SetSelection(firstOrder, firstOrder + patternsInserted);
+	SetCurrentPattern(order[firstOrder]);
 
 	m_modDoc.SetModified();
 	m_modDoc.UpdateAllViews(nullptr, SequenceHint().Data(), this);

Modified: trunk/OpenMPT/soundlib/patternContainer.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/patternContainer.cpp	Sun Mar  3 17:33:22 2024	(r20221)
+++ trunk/OpenMPT/soundlib/patternContainer.cpp	Sun Mar  3 17:45:38 2024	(r20222)
@@ -179,6 +179,18 @@
 }
 
 
+PATTERNINDEX CPatternContainer::GetRemainingCapacity() const noexcept
+{
+	PATTERNINDEX numRemaining = m_rSndFile.GetModSpecifications().patternsMax;
+	const PATTERNINDEX size = std::min(Size(), m_rSndFile.GetModSpecifications().patternsMax);
+	for(PATTERNINDEX pat = 0; pat < size; pat++)
+	{
+		if(m_Patterns[pat].IsValid())
+			numRemaining--;
+	}
+	return numRemaining;
+}
+
 
 void WriteModPatterns(std::ostream& oStrm, const CPatternContainer& patc)
 {

Modified: trunk/OpenMPT/soundlib/patternContainer.h
==============================================================================
--- trunk/OpenMPT/soundlib/patternContainer.h	Sun Mar  3 17:33:22 2024	(r20221)
+++ trunk/OpenMPT/soundlib/patternContainer.h	Sun Mar  3 17:45:38 2024	(r20222)
@@ -91,6 +91,8 @@
 	// Returns index of highest pattern with pattern named + 1.
 	PATTERNINDEX GetNumNamedPatterns() const noexcept;
 
+	// Number of patterns that can still be added, respecting the current format's limitations
+	PATTERNINDEX GetRemainingCapacity() const noexcept;
 
 private:
 	std::vector<CPattern> m_Patterns;

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

From: <sv...@op...> - 2024-03-03 16:33:35

Author: sagamusix
Date: Sun Mar  3 17:33:22 2024
New Revision: 20221
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20221

Log:
[Fix] Previous revision could crash when trying to insert a pattern sequence at the end of the order list when the pattern sequence itself ended with "---" patterns.

Modified:
   trunk/OpenMPT/soundlib/ModSequence.cpp
   trunk/OpenMPT/soundlib/ModSequence.h

Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp	Sun Mar  3 17:11:37 2024	(r20220)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp	Sun Mar  3 17:33:22 2024	(r20221)
@@ -101,10 +101,12 @@
 }
 
 
-ORDERINDEX ModSequence::GetRemainingCapacity() const noexcept
+ORDERINDEX ModSequence::GetRemainingCapacity(ORDERINDEX startingFrom) const noexcept
 {
 	const auto &specs = m_sndFile.GetModSpecifications();
-	const ORDERINDEX length = GetLengthTailTrimmed();
+	ORDERINDEX length = GetLengthTailTrimmed();
+	if(startingFrom != ORDERINDEX_INVALID && startingFrom > length)
+		length = startingFrom;
 	if(length >= specs.ordersMax)
 		return 0;
 	else
@@ -198,7 +200,7 @@
 {
 	const auto ordersMax = m_sndFile.GetModSpecifications().ordersMax;
 	// Limit number of orders to be inserted so that we don't exceed the format limit or drop items at the end of the order list.
-	LimitMax(count, GetRemainingCapacity());
+	LimitMax(count, GetRemainingCapacity(pos));
 	if(pos >= ordersMax || GetLengthTailTrimmed() >= ordersMax || count == 0)
 		return 0;
 	reserve(std::max(pos, GetLength()) + count);

Modified: trunk/OpenMPT/soundlib/ModSequence.h
==============================================================================
--- trunk/OpenMPT/soundlib/ModSequence.h	Sun Mar  3 17:11:37 2024	(r20220)
+++ trunk/OpenMPT/soundlib/ModSequence.h	Sun Mar  3 17:33:22 2024	(r20221)
@@ -49,7 +49,7 @@
 	// Returns length of sequence stopping counting on first '---' (or at the end of sequence).
 	ORDERINDEX GetLengthFirstEmpty() const noexcept;
 	// Returns amount of patterns that can be added at the end of the order list before reaching the current format's limits.
-	ORDERINDEX GetRemainingCapacity() const noexcept;
+	ORDERINDEX GetRemainingCapacity(ORDERINDEX startingFrom = ORDERINDEX_INVALID) const noexcept;
 
 	// Replaces order list with 'newSize' copies of 'pat'.
 	void assign(ORDERINDEX newSize, PATTERNINDEX pat);

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

From: <sv...@op...> - 2024-03-03 16:11:49

Author: sagamusix
Date: Sun Mar  3 17:11:37 2024
New Revision: 20220
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20220

Log:
[Imp/Fix] Limit insertion of multiple patterns so that patterns at the end of the sequence no longer disappear when reaching the format limit.

Modified:
   trunk/OpenMPT/soundlib/ModSequence.cpp
   trunk/OpenMPT/soundlib/ModSequence.h

Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp	Sun Mar  3 16:44:06 2024	(r20219)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp	Sun Mar  3 17:11:37 2024	(r20220)
@@ -101,6 +101,17 @@
 }
 
 
+ORDERINDEX ModSequence::GetRemainingCapacity() const noexcept
+{
+	const auto &specs = m_sndFile.GetModSpecifications();
+	const ORDERINDEX length = GetLengthTailTrimmed();
+	if(length >= specs.ordersMax)
+		return 0;
+	else
+		return specs.ordersMax - length;
+}
+
+
 ORDERINDEX ModSequence::GetNextOrderIgnoringSkips(const ORDERINDEX start) const noexcept
 {
 	if(empty())
@@ -186,10 +197,10 @@
 ORDERINDEX ModSequence::insert(ORDERINDEX pos, ORDERINDEX count, PATTERNINDEX fill)
 {
 	const auto ordersMax = m_sndFile.GetModSpecifications().ordersMax;
+	// Limit number of orders to be inserted so that we don't exceed the format limit or drop items at the end of the order list.
+	LimitMax(count, GetRemainingCapacity());
 	if(pos >= ordersMax || GetLengthTailTrimmed() >= ordersMax || count == 0)
 		return 0;
-	// Limit number of orders to be inserted so that we don't exceed the format limit.
-	LimitMax(count, static_cast<ORDERINDEX>(ordersMax - pos));
 	reserve(std::max(pos, GetLength()) + count);
 	// Inserting past the end of the container?
 	if(pos > size())

Modified: trunk/OpenMPT/soundlib/ModSequence.h
==============================================================================
--- trunk/OpenMPT/soundlib/ModSequence.h	Sun Mar  3 16:44:06 2024	(r20219)
+++ trunk/OpenMPT/soundlib/ModSequence.h	Sun Mar  3 17:11:37 2024	(r20220)
@@ -48,6 +48,8 @@
 	ORDERINDEX GetLengthTailTrimmed() const noexcept;
 	// Returns length of sequence stopping counting on first '---' (or at the end of sequence).
 	ORDERINDEX GetLengthFirstEmpty() const noexcept;
+	// Returns amount of patterns that can be added at the end of the order list before reaching the current format's limits.
+	ORDERINDEX GetRemainingCapacity() const noexcept;
 
 	// Replaces order list with 'newSize' copies of 'pat'.
 	void assign(ORDERINDEX newSize, PATTERNINDEX pat);

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

From: <sv...@op...> - 2024-03-03 15:44:20

Author: manx
Date: Sun Mar  3 16:44:06 2024
New Revision: 20219
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20219

Log:
[Var] Run clang-format.

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

Modified: trunk/OpenMPT/src/mpt/base/macros.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/macros.hpp	Sun Mar  3 16:34:39 2024	(r20218)
+++ trunk/OpenMPT/src/mpt/base/macros.hpp	Sun Mar  3 16:44:06 2024	(r20219)
@@ -162,7 +162,12 @@
 #define MPT_ASSUME(expr) __assume(expr)
 #endif
 #if MPT_COMPILER_GCC
-#define MPT_ASSUME(expr) do { if (!expr) { __builtin_unreachable(); } } while(0)
+#define MPT_ASSUME(expr) \
+	do { \
+		if (!expr) { \
+			__builtin_unreachable(); \
+		} \
+	} while (0)
 #endif
 #if !defined(MPT_ASSUME)
 #define MPT_ASSUME(expr) MPT_DISCARD(expr)

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

From: <sv...@op...> - 2024-03-03 15:34:47

Author: manx
Date: Sun Mar  3 16:34:39 2024
New Revision: 20218
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20218

Log:
[Ref] mpt/base/utility.hpp: Add mpt::unreachable() for C++23 std::unreachable().

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

Modified: trunk/OpenMPT/src/mpt/base/utility.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/utility.hpp	Sun Mar  3 16:32:41 2024	(r20217)
+++ trunk/OpenMPT/src/mpt/base/utility.hpp	Sun Mar  3 16:34:39 2024	(r20218)
@@ -53,14 +53,14 @@
 
 using std::to_underlying;
 
-#else
+#else // !C++23
 
 template <typename T>
 constexpr std::underlying_type_t<T> to_underlying(T value) noexcept {
 	return static_cast<typename std::underlying_type<T>::type>(value);
 }
 
-#endif
+#endif // C++23
 
 
 
@@ -193,6 +193,26 @@
 
 
 
+#if MPT_CXX_AT_LEAST(23)
+
+using std::unreachable;
+
+#else // !C++23
+
+[[noreturn]] inline void unreachable() {
+#if MPT_COMPILER_MSVC
+	__assume(false);
+#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
+	__builtin_unreachable();
+#else
+	return;
+#endif
+}
+
+#endif // C++23
+
+
+
 } // namespace MPT_INLINE_NS
 } // namespace mpt

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

From: <sv...@op...> - 2024-03-03 15:32:55

Author: manx
Date: Sun Mar  3 16:32:41 2024
New Revision: 20217
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20217

Log:
[Ref] mpt/base/macros.hpp: Add MPT_ASSUME(expr) for C++23 [[assume(expr)]].

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

Modified: trunk/OpenMPT/src/mpt/base/macros.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/macros.hpp	Sun Mar  3 13:49:57 2024	(r20216)
+++ trunk/OpenMPT/src/mpt/base/macros.hpp	Sun Mar  3 16:32:41 2024	(r20217)
@@ -152,4 +152,23 @@
 
 
 
+#if MPT_CXX_AT_LEAST(23)
+#define MPT_ASSUME(expr) [[assume(expr)]]
+#else // !C++23
+#if MPT_COMPILER_CLANG
+#define MPT_ASSUME(expr) __builtin_assume(expr)
+#endif
+#if MPT_COMPILER_MSVC
+#define MPT_ASSUME(expr) __assume(expr)
+#endif
+#if MPT_COMPILER_GCC
+#define MPT_ASSUME(expr) do { if (!expr) { __builtin_unreachable(); } } while(0)
+#endif
+#if !defined(MPT_ASSUME)
+#define MPT_ASSUME(expr) MPT_DISCARD(expr)
+#endif
+#endif // C++23
+
+
+
 #endif // MPT_BASE_MACROS_HPP

[OMPT-svn-commit] OpenMPT r20216 - branches/OpenMPT-1.31/common

From: <sv...@op...> - 2024-03-03 12:50:04

Author: manx
Date: Sun Mar  3 13:49:57 2024
New Revision: 20216
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20216

Log:
[Mod] OpenMPT: Version is now 1.31.05.01

Modified:
   branches/OpenMPT-1.31/common/versionNumber.h

Modified: branches/OpenMPT-1.31/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.31/common/versionNumber.h	Sun Mar  3 13:49:17 2024	(r20215)
+++ branches/OpenMPT-1.31/common/versionNumber.h	Sun Mar  3 13:49:57 2024	(r20216)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      31
 #define VER_MINOR      05
-#define VER_MINORMINOR 00
+#define VER_MINORMINOR 01
 
 OPENMPT_NAMESPACE_END

[OMPT-svn-commit] OpenMPT r20215 - branches/OpenMPT-1.28/common

From: <sv...@op...> - 2024-03-03 12:49:28

Author: manx
Date: Sun Mar  3 13:49:17 2024
New Revision: 20215
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20215

Log:
[Mod] OpenMPT: Version is now 1.28.10.57

Modified:
   branches/OpenMPT-1.28/common/versionNumber.h

Modified: branches/OpenMPT-1.28/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar  3 13:49:16 2024	(r20214)
+++ branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar  3 13:49:17 2024	(r20215)
@@ -21,7 +21,7 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      28
 #define VER_MINOR      10
-#define VER_MINORMINOR 56
+#define VER_MINORMINOR 57
 
 //Numerical value of the version.
 #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR)

[OMPT-svn-commit] OpenMPT r20211 - branches/OpenMPT-1.28/common

From: <sv...@op...> - 2024-03-03 12:49:26

Author: manx
Date: Sun Mar  3 13:49:14 2024
New Revision: 20211
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20211

Log:
[Mod] OpenMPT: Version is now 1.28.10.56

Modified:
   branches/OpenMPT-1.28/common/versionNumber.h

Modified: branches/OpenMPT-1.28/common/versionNumber.h
==============================================================================
--- branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar  3 13:48:56 2024	(r20210)
+++ branches/OpenMPT-1.28/common/versionNumber.h	Sun Mar  3 13:49:14 2024	(r20211)
@@ -21,7 +21,7 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      28
 #define VER_MINOR      10
-#define VER_MINORMINOR 55
+#define VER_MINORMINOR 56
 
 //Numerical value of the version.
 #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR)

[OMPT-svn-commit] OpenMPT r20212 - in branches/OpenMPT-1.28/libopenmpt: . dox

From: <sv...@op...> - 2024-03-03 12:49:26

Author: manx
Date: Sun Mar  3 13:49:15 2024
New Revision: 20212
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20212

Log:
[Mod] libopenmpt: Prepare for release.

Modified:
   branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar  3 13:49:14 2024	(r20211)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar  3 13:49:15 2024	(r20212)
@@ -5,7 +5,7 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
-### libopenmpt 0.4.39-pre
+### libopenmpt 0.4.39 (2024-03-03)
 
  *  Setting all possible `load_skip` flags resulted in nothing being loaded at
     all, instead of just not loading the selected module parts.

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar  3 13:49:14 2024	(r20211)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar  3 13:49:15 2024	(r20212)
@@ -21,9 +21,9 @@
 /*! \brief libopenmpt patch version number */
 #define OPENMPT_API_VERSION_PATCH 39
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL "-pre.0"
+#define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 1
+#define OPENMPT_API_VERSION_IS_PREREL 0
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar  3 13:49:14 2024	(r20211)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar  3 13:49:15 2024	(r20212)
@@ -1,7 +1,7 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=4
 LIBOPENMPT_VERSION_PATCH=39
-LIBOPENMPT_VERSION_PREREL=-pre.0
+LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=1
 LIBOPENMPT_LTVER_REVISION=39

[OMPT-svn-commit] OpenMPT r20214 - in branches/OpenMPT-1.28/libopenmpt: . dox

From: <sv...@op...> - 2024-03-03 12:49:23

Author: manx
Date: Sun Mar  3 13:49:16 2024
New Revision: 20214
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20214

Log:
[Mod] libopenmpt: Bump patch version.

Modified:
   branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar  3 13:49:16 2024	(r20213)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Sun Mar  3 13:49:16 2024	(r20214)
@@ -5,6 +5,8 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt 0.4.40-pre
+
 ### libopenmpt 0.4.39 (2024-03-03)
 
  *  Setting all possible `load_skip` flags resulted in nothing being loaded at

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar  3 13:49:16 2024	(r20213)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h	Sun Mar  3 13:49:16 2024	(r20214)
@@ -19,11 +19,11 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 4
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 39
+#define OPENMPT_API_VERSION_PATCH 40
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL ""
+#define OPENMPT_API_VERSION_PREREL "-pre.0"
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 0
+#define OPENMPT_API_VERSION_IS_PREREL 1
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar  3 13:49:16 2024	(r20213)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk	Sun Mar  3 13:49:16 2024	(r20214)
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=4
-LIBOPENMPT_VERSION_PATCH=39
-LIBOPENMPT_VERSION_PREREL=
+LIBOPENMPT_VERSION_PATCH=40
+LIBOPENMPT_VERSION_PREREL=-pre.0
 
 LIBOPENMPT_LTVER_CURRENT=1
-LIBOPENMPT_LTVER_REVISION=39
+LIBOPENMPT_LTVER_REVISION=40
 LIBOPENMPT_LTVER_AGE=1

[OMPT-svn-commit] OpenMPT r20213 - tags/libopenmpt-0.4.39

From: <sv...@op...> - 2024-03-03 12:49:22

Author: manx
Date: Sun Mar  3 13:49:16 2024
New Revision: 20213
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20213

Log:
tag libopenmpt-0.4.39

Added:
   tags/libopenmpt-0.4.39/   (props changed)
      - copied from r20212, branches/OpenMPT-1.28/

[OMPT-svn-commit] OpenMPT r20209 - in branches/OpenMPT-1.29/libopenmpt: . dox

From: <sv...@op...> - 2024-03-03 12:49:07

Author: manx
Date: Sun Mar  3 13:48:55 2024
New Revision: 20209
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20209

Log:
[Mod] libopenmpt: Bump patch version.

Modified:
   branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Mar  3 13:48:55 2024	(r20208)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Sun Mar  3 13:48:55 2024	(r20209)
@@ -5,6 +5,8 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt 0.5.28-pre
+
 ### libopenmpt 0.5.27 (2024-03-03)
 
  *  Setting all possible `load_skip` flags resulted in nothing being loaded at

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h	Sun Mar  3 13:48:55 2024	(r20208)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.h	Sun Mar  3 13:48:55 2024	(r20209)
@@ -19,11 +19,11 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 5
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 27
+#define OPENMPT_API_VERSION_PATCH 28
 /*! \brief libopenmpt pre-release tag */
-#define OPENMPT_API_VERSION_PREREL ""
+#define OPENMPT_API_VERSION_PREREL "-pre.0"
 /*! \brief libopenmpt pre-release flag */
-#define OPENMPT_API_VERSION_IS_PREREL 0
+#define OPENMPT_API_VERSION_IS_PREREL 1
 
 /*! \brief libopenmpt version number as a single integer value
  *  \since 0.3

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk	Sun Mar  3 13:48:55 2024	(r20208)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_version.mk	Sun Mar  3 13:48:55 2024	(r20209)
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=5
-LIBOPENMPT_VERSION_PATCH=27
-LIBOPENMPT_VERSION_PREREL=
+LIBOPENMPT_VERSION_PATCH=28
+LIBOPENMPT_VERSION_PREREL=-pre.0
 
 LIBOPENMPT_LTVER_CURRENT=2
-LIBOPENMPT_LTVER_REVISION=27
+LIBOPENMPT_LTVER_REVISION=28
 LIBOPENMPT_LTVER_AGE=2

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 153 154 155 156 157 .. 965 > >> (Page 155 of 965)