modplug-svn-commit — OpenMPT subversion commit notifications

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

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

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

Log:
Merged revision(s) 21351 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.7-dev+r5424 (2024-08-07).
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt
   branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c
   branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c
   branches/OpenMPT-1.28/include/mpg123/src/version.h

Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt	Wed Aug  7 17:38:13 2024	(r21354)
+++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt	Wed Aug  7 17:38:38 2024	(r21355)
@@ -1,11 +1,10 @@
-libmpg123 library version 1.32.6 (2024-04-04).
+libmpg123 library version 1.32.7-dev+r5424 (2024-08-07).
 The following changes have been made:
  *  `ports/MSVC++/config.h` has been added for MSVC builds.
  *  `ports/Xcode/config.h` has been retained from older versions.
  *  `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.28/include/mpg123/src/libmpg123/lfs_wrap.c
==============================================================================
--- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:38:13 2024	(r21354)
+++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:38:38 2024	(r21355)
@@ -207,7 +207,7 @@
 
 /* After settling the data... start with some simple wrappers. */
 
-// The fist block of wrappers is always present, using the native off_t width.
+// The first block of wrappers is always present, using the native off_t width.
 // (Exception: If explicitly disabled using FORCED_OFF_64.)
 // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix.
 // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing

Modified: branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:38:13 2024	(r21354)
+++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:38:38 2024	(r21355)
@@ -732,13 +732,8 @@
 		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"
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
-#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

Modified: branches/OpenMPT-1.28/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.28/include/mpg123/src/version.h	Wed Aug  7 17:38:13 2024	(r21354)
+++ branches/OpenMPT-1.28/include/mpg123/src/version.h	Wed Aug  7 17:38:38 2024	(r21355)
@@ -16,10 +16,10 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 6
+#define MPG123_PATCH 7
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX ""
+#define MPG123_SUFFIX "-dev"
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)

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

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

Author: manx
Date: Wed Aug  7 17:38:13 2024
New Revision: 21354
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21354

Log:
Merged revision(s) 21351 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.7-dev+r5424 (2024-08-07).
........

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

Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:53 2024	(r21353)
+++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt	Wed Aug  7 17:38:13 2024	(r21354)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.6 (2024-04-04).
+libmpg123 library version 1.32.7-dev+r5424 (2024-08-07).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.
@@ -6,7 +6,6 @@
  *  `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/lfs_wrap.c
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:53 2024	(r21353)
+++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:38:13 2024	(r21354)
@@ -207,7 +207,7 @@
 
 /* After settling the data... start with some simple wrappers. */
 
-// The fist block of wrappers is always present, using the native off_t width.
+// The first block of wrappers is always present, using the native off_t width.
 // (Exception: If explicitly disabled using FORCED_OFF_64.)
 // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix.
 // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing

Modified: branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:53 2024	(r21353)
+++ branches/OpenMPT-1.29/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:38:13 2024	(r21354)
@@ -732,13 +732,8 @@
 		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"
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
-#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

Modified: branches/OpenMPT-1.29/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.29/include/mpg123/src/version.h	Wed Aug  7 17:37:53 2024	(r21353)
+++ branches/OpenMPT-1.29/include/mpg123/src/version.h	Wed Aug  7 17:38:13 2024	(r21354)
@@ -16,10 +16,10 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 6
+#define MPG123_PATCH 7
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX ""
+#define MPG123_SUFFIX "-dev"
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)

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

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

Author: manx
Date: Wed Aug  7 17:37:53 2024
New Revision: 21353
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21353

Log:
Merged revision(s) 21351 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.7-dev+r5424 (2024-08-07).
........

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

Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:32 2024	(r21352)
+++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:53 2024	(r21353)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.6 (2024-04-04).
+libmpg123 library version 1.32.7-dev+r5424 (2024-08-07).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.
@@ -6,7 +6,6 @@
  *  `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/lfs_wrap.c
==============================================================================
--- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:32 2024	(r21352)
+++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:53 2024	(r21353)
@@ -207,7 +207,7 @@
 
 /* After settling the data... start with some simple wrappers. */
 
-// The fist block of wrappers is always present, using the native off_t width.
+// The first block of wrappers is always present, using the native off_t width.
 // (Exception: If explicitly disabled using FORCED_OFF_64.)
 // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix.
 // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing

Modified: branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:32 2024	(r21352)
+++ branches/OpenMPT-1.30/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:53 2024	(r21353)
@@ -732,13 +732,8 @@
 		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"
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
-#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

Modified: branches/OpenMPT-1.30/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.30/include/mpg123/src/version.h	Wed Aug  7 17:37:32 2024	(r21352)
+++ branches/OpenMPT-1.30/include/mpg123/src/version.h	Wed Aug  7 17:37:53 2024	(r21353)
@@ -16,10 +16,10 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 6
+#define MPG123_PATCH 7
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX ""
+#define MPG123_SUFFIX "-dev"
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)

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

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

Author: manx
Date: Wed Aug  7 17:37:32 2024
New Revision: 21352
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21352

Log:
Merged revision(s) 21351 from trunk/OpenMPT:
[Var] mpg123: Update to 1.32.7-dev+r5424 (2024-08-07).
........

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

Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:32 2024	(r21352)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.6 (2024-04-04).
+libmpg123 library version 1.32.7-dev+r5424 (2024-08-07).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.
@@ -6,7 +6,6 @@
  *  `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/lfs_wrap.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:32 2024	(r21352)
@@ -207,7 +207,7 @@
 
 /* After settling the data... start with some simple wrappers. */
 
-// The fist block of wrappers is always present, using the native off_t width.
+// The first block of wrappers is always present, using the native off_t width.
 // (Exception: If explicitly disabled using FORCED_OFF_64.)
 // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix.
 // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing

Modified: branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:32 2024	(r21352)
@@ -732,13 +732,8 @@
 		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"
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
-#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h
==============================================================================
--- branches/OpenMPT-1.31/include/mpg123/src/version.h	Wed Aug  7 17:37:06 2024	(r21351)
+++ branches/OpenMPT-1.31/include/mpg123/src/version.h	Wed Aug  7 17:37:32 2024	(r21352)
@@ -16,10 +16,10 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 6
+#define MPG123_PATCH 7
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX ""
+#define MPG123_SUFFIX "-dev"
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)

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

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

Author: manx
Date: Wed Aug  7 17:37:06 2024
New Revision: 21351
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21351

Log:
[Var] mpg123: Update to 1.32.7-dev+r5424 (2024-08-07).

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

Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt
==============================================================================
--- trunk/OpenMPT/include/mpg123/OpenMPT.txt	Wed Aug  7 17:07:15 2024	(r21350)
+++ trunk/OpenMPT/include/mpg123/OpenMPT.txt	Wed Aug  7 17:37:06 2024	(r21351)
@@ -1,4 +1,4 @@
-libmpg123 library version 1.32.6 (2024-04-04).
+libmpg123 library version 1.32.7-dev+r5424 (2024-08-07).
 The following changes have been made:
  *  `ports/makefile/config.h` has been added for plain `Makefile` builds.
  *  `ports/MSVC++/config.h` has been added for MSVC builds.
@@ -6,7 +6,6 @@
  *  `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/lfs_wrap.c
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:07:15 2024	(r21350)
+++ trunk/OpenMPT/include/mpg123/src/libmpg123/lfs_wrap.c	Wed Aug  7 17:37:06 2024	(r21351)
@@ -207,7 +207,7 @@
 
 /* After settling the data... start with some simple wrappers. */
 
-// The fist block of wrappers is always present, using the native off_t width.
+// The first block of wrappers is always present, using the native off_t width.
 // (Exception: If explicitly disabled using FORCED_OFF_64.)
 // A second block mirrors that in case of sizeof(off_t)==4 with _32 suffix.
 // A third block follows if 64 bit off_t is available with _64 suffix, just aliasing

Modified: trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:07:15 2024	(r21350)
+++ trunk/OpenMPT/include/mpg123/src/libmpg123/readers.c	Wed Aug  7 17:37:06 2024	(r21351)
@@ -732,13 +732,8 @@
 		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"
+		debug5("bc_forget: forgot %p with %td, pos=%td, size=%td, fileoff=%"PRIi64
 		,	(void*)b->data, b->size, bc->pos,  bc->size, bc->fileoff);
-#endif  /* OpenMPT */
 
 		bc_free(bc, b);
 		b = n;

Modified: trunk/OpenMPT/include/mpg123/src/version.h
==============================================================================
--- trunk/OpenMPT/include/mpg123/src/version.h	Wed Aug  7 17:07:15 2024	(r21350)
+++ trunk/OpenMPT/include/mpg123/src/version.h	Wed Aug  7 17:37:06 2024	(r21351)
@@ -16,10 +16,10 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 6
+#define MPG123_PATCH 7
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
-#define MPG123_SUFFIX ""
+#define MPG123_SUFFIX "-dev"
 
 #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "."  #b  "." #c
 #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c)

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

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

Author: manx
Date: Wed Aug  7 17:07:15 2024
New Revision: 21350
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21350

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

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	Wed Aug  7 17:06:10 2024	(r21349)
+++ branches/OpenMPT-1.31/build/download_externals.cmd	Wed Aug  7 17:07:15 2024	(r21350)
@@ -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.4/python-3.12.4-embed-amd64.zip" "build\externals\python-3.12.4-embed-amd64.zip" f07be8d84645f2411d061262b378d783498f23a961a9eb3dc3cf5c785af75de551cd4f413c385f47219601d2b09fa6ae88242226b1e31cf009929d3ff5d6673e 11065736 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.5/python-3.12.5-embed-amd64.zip" "build\externals\python-3.12.5-embed-amd64.zip" d1f478a24c16aa46ca7950a13881563c46301bd698f614077a6b2076d2cea49d6cf0555515b5ead94be43f95cf9bc6e30d1b6ded77555b0f42d2f4c140ec6a96 11058677 || 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.4-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.5-embed-amd64.zip" "." || goto error
 
 call :killdir "build\tools\innounp"   || goto error
 call :killdir "build\tools\innosetup" || goto error

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

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

Author: manx
Date: Wed Aug  7 17:06:10 2024
New Revision: 21349
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21349

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

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	Wed Aug  7 17:05:18 2024	(r21348)
+++ trunk/OpenMPT/build/download_externals.cmd	Wed Aug  7 17:06:10 2024	(r21349)
@@ -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.4-embed-amd64.zip" "." || goto error
+call build\scriptlib\unpack.cmd "build\tools\python3" "build\externals\python-3.12.5-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	Wed Aug  7 17:05:18 2024	(r21348)
+++ trunk/OpenMPT/build/download_externals.txt	Wed Aug  7 17:06:10 2024	(r21349)
@@ -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.4-embed-amd64.zip" 11065736 f07be8d84645f2411d061262b378d783498f23a961a9eb3dc3cf5c785af75de551cd4f413c385f47219601d2b09fa6ae88242226b1e31cf009929d3ff5d6673e "https://www.python.org/ftp/python/3.12.4/python-3.12.4-embed-amd64.zip"
+"build/externals/python-3.12.5-embed-amd64.zip" 11058677 d1f478a24c16aa46ca7950a13881563c46301bd698f614077a6b2076d2cea49d6cf0555515b5ead94be43f95cf9bc6e30d1b6ded77555b0f42d2f4c140ec6a96 "https://www.python.org/ftp/python/3.12.5/python-3.12.5-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.1.exe"            5251664 65d8b14febd0f8003c89c468966912f8fd799e48986fee8bd5f0549936f6cb9cd5ff11c5429e0b2587215140e595fcacbc129b6f81cccc09ca518758da4d86bc "https://files.jrsoftware.org/is/6/innosetup-6.3.1.exe"
 "build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"

[OMPT-svn-commit] OpenMPT r21348 - trunk/OpenMPT/build/scriptlib

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

Author: manx
Date: Wed Aug  7 17:05:18 2024
New Revision: 21348
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21348

Log:
[Fix] build/download_externals: Fix typo in Delete-File.

Modified:
   trunk/OpenMPT/build/scriptlib/Delete-File.ps1

Modified: trunk/OpenMPT/build/scriptlib/Delete-File.ps1
==============================================================================
--- trunk/OpenMPT/build/scriptlib/Delete-File.ps1	Wed Aug  7 14:39:04 2024	(r21347)
+++ trunk/OpenMPT/build/scriptlib/Delete-File.ps1	Wed Aug  7 17:05:18 2024	(r21348)
@@ -1,3 +1,3 @@
 param([String]$filename="")
-Remove-Item $filenme
+Remove-Item $filename
 exit 0

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

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

Author: manx
Date: Wed Aug  7 14:39:04 2024
New Revision: 21347
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21347

Log:
[Fix] mpt/base/detect_compiler.hpp: Fix MSVC C++ version detection typo. Broken since rr21284.

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

Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Wed Aug  7 10:39:22 2024	(r21346)
+++ trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Wed Aug  7 14:39:04 2024	(r21347)
@@ -190,7 +190,7 @@
 
 #elif MPT_COMPILER_MSVC
 
-#if MPT_MSVC_AT_LEAST(2025, 3)
+#if MPT_MSVC_AT_LEAST(2015, 3)
 #if (_MSVC_LANG >= 202302)
 #define MPT_CXX 23
 #elif (_MSVC_LANG >= 202002)

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

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

Author: manx
Date: Wed Aug  7 10:39:22 2024
New Revision: 21346
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21346

Log:
Merged revision(s) 21345 from trunk/OpenMPT:
[Imp] Add raw CPUID to About Dialog and Crash Dump.
........

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

Modified: branches/OpenMPT-1.31/mptrack/AboutDialog.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/AboutDialog.cpp	Wed Aug  7 10:39:03 2024	(r21345)
+++ branches/OpenMPT-1.31/mptrack/AboutDialog.cpp	Wed Aug  7 10:39:22 2024	(r21346)
@@ -385,11 +385,13 @@
 			text += MPT_UFORMAT("System Architecture: {}\n")(mpt::OS::Windows::Name(mpt::OS::Windows::GetHostArchitecture()));
 #ifdef MPT_ENABLE_ARCH_INTRINSICS
 #if MPT_ARCH_X86 || MPT_ARCH_AMD64
-			text += MPT_UFORMAT("CPU: {}, Family {}, Model {}, Stepping {}\n")
+			text += MPT_UFORMAT("CPU: {}, Family {}, Model {}, Stepping {} ({}/{})\n")
 				( mpt::ToUnicode(mpt::Charset::ASCII, (CPUInfo.get_vendor_string().length() > 0) ? CPUInfo.get_vendor_string() : std::string("Generic"))
 				, CPUInfo.get_family()
 				, CPUInfo.get_model()
 				, CPUInfo.get_stepping()
+				, mpt::ToUnicode(mpt::Charset::ASCII, CPUInfo.get_vendor_string())
+				, mpt::ufmt::hex0<8>(CPUInfo.get_cpuid())
 				);
 			text += MPT_UFORMAT("CPU Name: {}\n")(mpt::ToUnicode(mpt::Charset::ASCII, (CPUInfo.get_brand_string().length() > 0) ? CPUInfo.get_brand_string() : std::string("")));
 #endif

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

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

Author: manx
Date: Wed Aug  7 10:39:03 2024
New Revision: 21345
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21345

Log:
[Imp] Add raw CPUID to About Dialog and Crash Dump.

Modified:
   trunk/OpenMPT/mptrack/AboutDialog.cpp

Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp	Tue Aug  6 22:27:15 2024	(r21344)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp	Wed Aug  7 10:39:03 2024	(r21345)
@@ -385,11 +385,13 @@
 			text += MPT_UFORMAT("System Architecture: {}\n")(mpt::OS::Windows::Name(mpt::OS::Windows::GetHostArchitecture()));
 #ifdef MPT_ENABLE_ARCH_INTRINSICS
 #if MPT_ARCH_X86 || MPT_ARCH_AMD64
-			text += MPT_UFORMAT("CPU: {}, Family {}, Model {}, Stepping {}\n")
+			text += MPT_UFORMAT("CPU: {}, Family {}, Model {}, Stepping {} ({}/{})\n")
 				( mpt::ToUnicode(mpt::Charset::ASCII, (CPUInfo.get_vendor_string().length() > 0) ? CPUInfo.get_vendor_string() : std::string("Generic"))
 				, CPUInfo.get_family()
 				, CPUInfo.get_model()
 				, CPUInfo.get_stepping()
+				, mpt::ToUnicode(mpt::Charset::ASCII, CPUInfo.get_vendor_string())
+				, mpt::ufmt::hex0<8>(CPUInfo.get_cpuid())
 				);
 			text += MPT_UFORMAT("CPU Name: {}\n")(mpt::ToUnicode(mpt::Charset::ASCII, (CPUInfo.get_brand_string().length() > 0) ? CPUInfo.get_brand_string() : std::string("")));
 #endif

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

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

Author: sagamusix
Date: Tue Aug  6 22:27:15 2024
New Revision: 21344
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21344

Log:
[Fix] Plugin Manager: Scanning plugins leaked a plugin bridge object and kept the bridge process alive until OpenMPT closed.

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

Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Tue Aug  6 22:10:49 2024	(r21343)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Tue Aug  6 22:27:15 2024	(r21344)
@@ -599,6 +599,7 @@
 					}
 					CVstPlugin::GetPluginMetadata(maskCrashes, loadResult, library);
 				});
+			CVstPlugin::DispatchSEH(maskCrashes, *pEffect, Vst::effClose, 0, 0, 0, 0, exception);
 		}
 		if(loadResult.library)
 		{

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

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

Author: sagamusix
Date: Tue Aug  6 22:10:49 2024
New Revision: 21343
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21343

Log:
[Fix] Compile fix.

Modified:
   trunk/OpenMPT/mptrack/Vstplug.cpp

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	Tue Aug  6 21:57:07 2024	(r21342)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	Tue Aug  6 22:10:49 2024	(r21343)
@@ -290,7 +290,7 @@
 
 bool CVstPlugin::SelectShellPlugin(bool maskCrashes, LoadResult &loadResult, const VSTPluginLib &plugin)
 {
-	g_shellPluginToLoad = plugin.shellPluginID.ToInt();
+	g_shellPluginToLoad = plugin.shellPluginID;
 	if(loadResult.effect && IsBridged(*loadResult.effect))
 	{
 		loadResult.effect->dispatcher(loadResult.effect, Vst::effVendorSpecific, kVendorOpenMPT, kCallVSTPluginMain, nullptr, 0.0f);

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

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

Author: sagamusix
Date: Tue Aug  6 21:57:07 2024
New Revision: 21342
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21342

Log:
[Ref] VST: Small cleanup.

Modified:
   trunk/OpenMPT/mptrack/Vstplug.cpp

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	Tue Aug  6 19:53:52 2024	(r21341)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	Tue Aug  6 21:57:07 2024	(r21342)
@@ -255,7 +255,7 @@
 	result.magic = effect->magic;
 	result.uniqueID = effect->uniqueID;
 
-	size_t shellPlugIndex = 0;
+	bool requestedShellPluginFound = false;
 	if(static_cast<PluginCategory>(DispatchSEH(maskCrashes, *effect, Vst::effGetPlugCategory, 0, 0, nullptr, 0, exception)) == PluginCategory::Shell)
 	{
 		std::vector<char> name(256, 0);  // 64 chars officially supported, but our plugin bridge assumes 256 chars max for all strings
@@ -266,13 +266,13 @@
 			result.shellPlugins.push_back(LoadResult::ShellPlugin{name.data(), static_cast<uint32>(childID)});
 
 			if(static_cast<uint32>(childID) == plugin.shellPluginID)
-				shellPlugIndex = result.shellPlugins.size();
+				requestedShellPluginFound = true;
 		}
 	}
 
 	if(plugin.shellPluginID)
 	{
-		if(!shellPlugIndex)
+		if(!requestedShellPluginFound)
 		{
 			result.effect = nullptr;
 			Reporting::Error(MPT_UFORMAT("The shell plugin \"{}\" does not contain \"{}\".")
@@ -290,11 +290,8 @@
 
 bool CVstPlugin::SelectShellPlugin(bool maskCrashes, LoadResult &loadResult, const VSTPluginLib &plugin)
 {
-	if(!loadResult.effect)
-		return false;
-
-	g_shellPluginToLoad = plugin.shellPluginID;
-	if(IsBridged(*loadResult.effect))
+	g_shellPluginToLoad = plugin.shellPluginID.ToInt();
+	if(loadResult.effect && IsBridged(*loadResult.effect))
 	{
 		loadResult.effect->dispatcher(loadResult.effect, Vst::effVendorSpecific, kVendorOpenMPT, kCallVSTPluginMain, nullptr, 0.0f);
 	} else

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

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

Author: sagamusix
Date: Tue Aug  6 19:53:52 2024
New Revision: 21341
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21341

Log:
Merged revision(s) 21340 from trunk/OpenMPT:
[Fix] Compile fix for retro builds.
........

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

Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/IPCWindow.cpp	Tue Aug  6 19:53:25 2024	(r21340)
+++ branches/OpenMPT-1.31/mptrack/IPCWindow.cpp	Tue Aug  6 19:53:52 2024	(r21341)
@@ -123,7 +123,7 @@
 	void UpdateLastUsed()
 	{
 		if(ipcWindow)
-			SetWindowLongPtr(ipcWindow, GWLP_USERDATA, mpt::saturate_cast<LONG_PTR>(GetTickCount64() / 100));
+			SetWindowLongPtr(ipcWindow, GWLP_USERDATA, mpt::saturate_cast<LONG_PTR>(Util::GetTickCount64() / 100));
 	}
 
 	LRESULT SendIPC(HWND ipcWnd, Function function, mpt::const_byte_span data)
@@ -150,7 +150,7 @@
 
 	struct EnumWindowState
 	{
-		uint64 lastActive = 0;
+		uintptr_t lastActive = 0;
 		HWND result = nullptr;
 		FlagSet<InstanceRequirements> require;
 	};
@@ -194,7 +194,7 @@
 							return TRUE; // continue
 						}
 					}
-					uint64 lastActive = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+					uintptr_t lastActive = GetWindowLongPtr(hwnd, GWLP_USERDATA);
 					if(!state.result || lastActive >= state.lastActive)
 					{
 						state.result = hwnd;

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

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

Author: sagamusix
Date: Tue Aug  6 19:53:25 2024
New Revision: 21340
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21340

Log:
[Fix] Compile fix for retro builds.

Modified:
   trunk/OpenMPT/mptrack/IPCWindow.cpp

Modified: trunk/OpenMPT/mptrack/IPCWindow.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/IPCWindow.cpp	Tue Aug  6 19:38:41 2024	(r21339)
+++ trunk/OpenMPT/mptrack/IPCWindow.cpp	Tue Aug  6 19:53:25 2024	(r21340)
@@ -132,7 +132,7 @@
 	void UpdateLastUsed()
 	{
 		if(ipcWindow)
-			SetWindowLongPtr(ipcWindow, GWLP_USERDATA, mpt::saturate_cast<LONG_PTR>(GetTickCount64() / 100));
+			SetWindowLongPtr(ipcWindow, GWLP_USERDATA, mpt::saturate_cast<LONG_PTR>(Util::GetTickCount64() / 100));
 	}
 
 	LRESULT SendIPC(HWND ipcWnd, Function function, mpt::const_byte_span data)
@@ -159,7 +159,7 @@
 
 	struct EnumWindowState
 	{
-		uint64 lastActive = 0;
+		uintptr_t lastActive = 0;
 		HWND result = nullptr;
 		FlagSet<InstanceRequirements> require;
 	};
@@ -203,7 +203,7 @@
 							return TRUE; // continue
 						}
 					}
-					uint64 lastActive = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+					uintptr_t lastActive = GetWindowLongPtr(hwnd, GWLP_USERDATA);
 					if(!state.result || lastActive >= state.lastActive)
 					{
 						state.result = hwnd;

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

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

Author: sagamusix
Date: Tue Aug  6 19:38:41 2024
New Revision: 21339
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21339

Log:
Merged revision(s) 21338 from trunk/OpenMPT:
[Imp] When looking for an OpenMPT process to send an IPC command to, always try sending it to the OpenMPT window that was touched last, rather than simply the last match in the list.
........

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

Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/IPCWindow.cpp	Tue Aug  6 19:36:59 2024	(r21338)
+++ branches/OpenMPT-1.31/mptrack/IPCWindow.cpp	Tue Aug  6 19:38:41 2024	(r21339)
@@ -120,6 +120,12 @@
 		ipcWindow = nullptr;
 	}
 
+	void UpdateLastUsed()
+	{
+		if(ipcWindow)
+			SetWindowLongPtr(ipcWindow, GWLP_USERDATA, mpt::saturate_cast<LONG_PTR>(GetTickCount64() / 100));
+	}
+
 	LRESULT SendIPC(HWND ipcWnd, Function function, mpt::const_byte_span data)
 	{
 		if(!ipcWnd)
@@ -144,13 +150,14 @@
 
 	struct EnumWindowState
 	{
-		FlagSet<InstanceRequirements> require;
+		uint64 lastActive = 0;
 		HWND result = nullptr;
+		FlagSet<InstanceRequirements> require;
 	};
 
 	static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam)
 	{
-		EnumWindowState &state = *reinterpret_cast<EnumWindowState*>(lParam);
+		EnumWindowState &state = *reinterpret_cast<EnumWindowState *>(lParam);
 		if(hwnd)
 		{
 			TCHAR className[256];
@@ -187,9 +194,13 @@
 							return TRUE; // continue
 						}
 					}
-					state.result = hwnd;
+					uint64 lastActive = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+					if(!state.result || lastActive >= state.lastActive)
+					{
+						state.result = hwnd;
+						state.lastActive = lastActive;
+					}
 					return TRUE; // continue
-					//return FALSE; // done
 				}
 			}
 		}

Modified: branches/OpenMPT-1.31/mptrack/IPCWindow.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/IPCWindow.h	Tue Aug  6 19:36:59 2024	(r21338)
+++ branches/OpenMPT-1.31/mptrack/IPCWindow.h	Tue Aug  6 19:38:41 2024	(r21339)
@@ -30,6 +30,8 @@
 
 	void Close();
 
+	void UpdateLastUsed();
+
 	LRESULT SendIPC(HWND ipcWnd, Function function, mpt::const_byte_span data = mpt::const_byte_span());
 
 	template <typename Tdata> LRESULT SendIPC(HWND ipcWnd, Function function, mpt::span<const Tdata> data) { return SendIPC(ipcWnd, function, mpt::const_byte_span(reinterpret_cast<const std::byte*>(data.data()), data.size() * sizeof(Tdata))); }

Modified: branches/OpenMPT-1.31/mptrack/MainFrm.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/MainFrm.cpp	Tue Aug  6 19:36:59 2024	(r21338)
+++ branches/OpenMPT-1.31/mptrack/MainFrm.cpp	Tue Aug  6 19:38:41 2024	(r21339)
@@ -50,6 +50,7 @@
 #include "Vstplug.h"
 #include "FileDialog.h"
 #include "ProgressDialog.h"
+#include "IPCWindow.h"
 #include <HtmlHelp.h>
 #include <Dbt.h>  // device change messages
 #include "mpt/audio/span.hpp"
@@ -465,11 +466,13 @@
 }
 
 
-void CMainFrame::OnActivateApp(BOOL active, DWORD /*threadID*/)
+void CMainFrame::OnActivateApp(BOOL active, DWORD threadID)
 {
-	// Ensure modifiers are reset when we leave the window (e.g. Alt-Tab)
-	if(!active)
-		m_InputHandler->SetModifierMask(ModNone);
+	if(active)
+		IPCWindow::UpdateLastUsed();
+	else	
+		m_InputHandler->SetModifierMask(ModNone);	// Ensure modifiers are reset when we leave the window (e.g. Alt-Tab)
+	CMDIFrameWnd::OnActivateApp(active, threadID);
 }
 
 
@@ -2443,7 +2446,7 @@
 	{
 		case kcViewTree: OnBarCheck(IDD_TREEVIEW); break;
 		case kcViewOptions: OnViewOptions(); break;
-		case kcViewMain: OnBarCheck(59392 /* MAINVIEW */); break;
+		case kcViewMain: OnBarCheck(ID_VIEW_TOOLBAR); break;
 	 	case kcFileImportMidiLib: OnImportMidiLib(); break;
 		case kcFileAddSoundBank: OnAddDlsBank(); break;
 		case kcPauseSong:	OnPlayerPause(); break;

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

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

Author: sagamusix
Date: Tue Aug  6 19:36:59 2024
New Revision: 21338
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21338

Log:
[Imp] When looking for an OpenMPT process to send an IPC command to, always try sending it to the OpenMPT window that was touched last, rather than simply the last match in the list.

Modified:
   trunk/OpenMPT/mptrack/IPCWindow.cpp
   trunk/OpenMPT/mptrack/IPCWindow.h
   trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/mptrack/IPCWindow.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/IPCWindow.cpp	Tue Aug  6 15:56:03 2024	(r21337)
+++ trunk/OpenMPT/mptrack/IPCWindow.cpp	Tue Aug  6 19:36:59 2024	(r21338)
@@ -129,6 +129,12 @@
 		ipcWindow = nullptr;
 	}
 
+	void UpdateLastUsed()
+	{
+		if(ipcWindow)
+			SetWindowLongPtr(ipcWindow, GWLP_USERDATA, mpt::saturate_cast<LONG_PTR>(GetTickCount64() / 100));
+	}
+
 	LRESULT SendIPC(HWND ipcWnd, Function function, mpt::const_byte_span data)
 	{
 		if(!ipcWnd)
@@ -153,13 +159,14 @@
 
 	struct EnumWindowState
 	{
-		FlagSet<InstanceRequirements> require;
+		uint64 lastActive = 0;
 		HWND result = nullptr;
+		FlagSet<InstanceRequirements> require;
 	};
 
 	static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam)
 	{
-		EnumWindowState &state = *reinterpret_cast<EnumWindowState*>(lParam);
+		EnumWindowState &state = *reinterpret_cast<EnumWindowState *>(lParam);
 		if(hwnd)
 		{
 			TCHAR className[256];
@@ -196,9 +203,13 @@
 							return TRUE; // continue
 						}
 					}
-					state.result = hwnd;
+					uint64 lastActive = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+					if(!state.result || lastActive >= state.lastActive)
+					{
+						state.result = hwnd;
+						state.lastActive = lastActive;
+					}
 					return TRUE; // continue
-					//return FALSE; // done
 				}
 			}
 		}

Modified: trunk/OpenMPT/mptrack/IPCWindow.h
==============================================================================
--- trunk/OpenMPT/mptrack/IPCWindow.h	Tue Aug  6 15:56:03 2024	(r21337)
+++ trunk/OpenMPT/mptrack/IPCWindow.h	Tue Aug  6 19:36:59 2024	(r21338)
@@ -31,6 +31,8 @@
 
 	void Close();
 
+	void UpdateLastUsed();
+
 	LRESULT SendIPC(HWND ipcWnd, Function function, mpt::const_byte_span data = mpt::const_byte_span());
 
 	template <typename Tdata> LRESULT SendIPC(HWND ipcWnd, Function function, mpt::span<const Tdata> data) { return SendIPC(ipcWnd, function, mpt::const_byte_span(reinterpret_cast<const std::byte*>(data.data()), data.size() * sizeof(Tdata))); }

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Tue Aug  6 15:56:03 2024	(r21337)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Tue Aug  6 19:36:59 2024	(r21338)
@@ -23,6 +23,7 @@
 #include "Globals.h"
 #include "ImageLists.h"
 #include "InputHandler.h"
+#include "IPCWindow.h"
 #include "KeyConfigDlg.h"
 #include "Moddoc.h"
 #include "ModDocTemplate.h"
@@ -494,11 +495,13 @@
 }
 
 
-void CMainFrame::OnActivateApp(BOOL active, DWORD /*threadID*/)
+void CMainFrame::OnActivateApp(BOOL active, DWORD threadID)
 {
-	// Ensure modifiers are reset when we leave the window (e.g. Alt-Tab)
-	if(!active)
-		m_InputHandler->SetModifierMask(ModNone);
+	if(active)
+		IPCWindow::UpdateLastUsed();
+	else	
+		m_InputHandler->SetModifierMask(ModNone);	// Ensure modifiers are reset when we leave the window (e.g. Alt-Tab)
+	CMDIFrameWnd::OnActivateApp(active, threadID);
 }
 
 
@@ -2545,7 +2548,7 @@
 	{
 		case kcViewTree: OnBarCheck(IDD_TREEVIEW); break;
 		case kcViewOptions: OnViewOptions(); break;
-		case kcViewMain: OnBarCheck(59392 /* MAINVIEW */); break;
+		case kcViewMain: OnBarCheck(ID_VIEW_TOOLBAR); break;
 	 	case kcFileImportMidiLib: OnImportMidiLib(); break;
 		case kcFileAddSoundBank: OnAddDlsBank(); break;
 		case kcPauseSong:	OnPlayerPause(); break;

[OMPT-svn-commit] OpenMPT r21337 - trunk/OpenMPT/pluginBridge

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

Author: sagamusix
Date: Tue Aug  6 15:56:03 2024
New Revision: 21337
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21337

Log:
[Ref] Silence warning.

Modified:
   trunk/OpenMPT/pluginBridge/Bridge.cpp

Modified: trunk/OpenMPT/pluginBridge/Bridge.cpp
==============================================================================
--- trunk/OpenMPT/pluginBridge/Bridge.cpp	Mon Aug  5 23:59:39 2024	(r21336)
+++ trunk/OpenMPT/pluginBridge/Bridge.cpp	Tue Aug  6 15:56:03 2024	(r21337)
@@ -629,6 +629,7 @@
 					m_nativeEffect = m_mainProc(MasterCallback);
 					UpdateEffectStruct();
 				}
+				break;
 			default:
 				msg.result = 0;
 			}

[OMPT-svn-commit] OpenMPT r21336 - in branches/OpenMPT-1.30: . soundlib

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

Author: sagamusix
Date: Mon Aug  5 23:59:39 2024
New Revision: 21336
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21336

Log:
Merged revision(s) 21334 from trunk/OpenMPT:
[Fix] SFX: Last arpeggio note is held at end of row, and a peculiar 0-1-2-0-2-1 arpeggio table is used. Fixes Bassbomb/ok.sfx (https://www.un4seen.com/forum/?topic=15448.msg143414#msg143414).
[Fix] SFX: Ignore unused data at end of oneshot samples which sometimes caused clicky noises (https://www.un4seen.com/forum/?topic=15448.msg143414#msg143414).
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Load_sfx.cpp
   branches/OpenMPT-1.30/soundlib/Sndmix.cpp

Modified: branches/OpenMPT-1.30/soundlib/Load_sfx.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_sfx.cpp	Mon Aug  5 23:59:24 2024	(r21335)
+++ branches/OpenMPT-1.30/soundlib/Load_sfx.cpp	Mon Aug  5 23:59:39 2024	(r21336)
@@ -54,7 +54,7 @@
 struct SFXSampleHeader
 {
 	char     name[22];
-	char     dummy[2];  // Supposedly sample length, but almost always incorrect
+	uint16be oneshotLength;  // For unlooped samples, this is quite frequently 2 bytes shorter than the sample data length (and the last two samples would cause a click to be heard)
 	uint8be  finetune;
 	uint8be  volume;
 	uint16be loopStart;
@@ -64,7 +64,7 @@
 	void ConvertToMPT(ModSample &mptSmp, uint32 length) const
 	{
 		mptSmp.Initialize(MOD_TYPE_MOD);
-		mptSmp.nLength = length;
+		mptSmp.nLength = (loopLength > 1) ? length : (oneshotLength * 2u);
 		mptSmp.nFineTune = MOD2XMFineTune(finetune);
 		mptSmp.nVolume = 4u * std::min(volume.get(), uint8(64));
 
@@ -440,14 +440,18 @@
 	// Reading samples
 	if(loadFlags & loadSampleData)
 	{
-		for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) if(Samples[smp].nLength)
+		for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++)
 		{
+			if(!sampleLen[smp - 1])
+				continue;
+
+			FileReader chunk = file.ReadChunk(sampleLen[smp - 1]);
 			SampleIO(
 				SampleIO::_8bit,
 				SampleIO::mono,
 				SampleIO::littleEndian,
 				SampleIO::signedPCM)
-				.ReadSample(Samples[smp], file);
+				.ReadSample(Samples[smp], chunk);
 		}
 	}
 

Modified: branches/OpenMPT-1.30/soundlib/Sndmix.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Sndmix.cpp	Mon Aug  5 23:59:24 2024	(r21335)
+++ branches/OpenMPT-1.30/soundlib/Sndmix.cpp	Mon Aug  5 23:59:39 2024	(r21336)
@@ -1575,6 +1575,11 @@
 				uint8 note = (GetType() != MOD_TYPE_MOD) ? chn.nNote : static_cast<uint8>(GetNoteFromPeriod(period, chn.nFineTune, chn.nC5Speed));
 				if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI))
 					tick += 2;
+
+				// SFX uses a 0-1-2-0-2-1 pattern (fixed at 6 ticks per row)
+				if(GetType() == MOD_TYPE_SFX && tick > 3)
+					tick ^= 3;
+
 				switch(tick % 3)
 				{
 				case 1: note += (chn.nArpeggio >> 4); break;
@@ -1597,7 +1602,7 @@
 					}
 					period = GetPeriodFromNote(note, chn.nFineTune, chn.nC5Speed);
 
-					if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI | MOD_TYPE_PSM | MOD_TYPE_STM | MOD_TYPE_OKT))
+					if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI | MOD_TYPE_PSM | MOD_TYPE_STM | MOD_TYPE_OKT | MOD_TYPE_SFX))
 					{
 						// The arpeggio note offset remains effective after the end of the current row in ScreamTracker 2.
 						// This fixes the flute lead in MORPH.STM by Skaven, pattern 27.

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

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

Author: sagamusix
Date: Mon Aug  5 23:59:24 2024
New Revision: 21335
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21335

Log:
Merged revision(s) 21334 from trunk/OpenMPT:
[Fix] SFX: Last arpeggio note is held at end of row, and a peculiar 0-1-2-0-2-1 arpeggio table is used. Fixes Bassbomb/ok.sfx (https://www.un4seen.com/forum/?topic=15448.msg143414#msg143414).
[Fix] SFX: Ignore unused data at end of oneshot samples which sometimes caused clicky noises (https://www.un4seen.com/forum/?topic=15448.msg143414#msg143414).
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_sfx.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_sfx.cpp	Mon Aug  5 23:59:00 2024	(r21334)
+++ branches/OpenMPT-1.31/soundlib/Load_sfx.cpp	Mon Aug  5 23:59:24 2024	(r21335)
@@ -54,7 +54,7 @@
 struct SFXSampleHeader
 {
 	char     name[22];
-	char     dummy[2];  // Supposedly sample length, but almost always incorrect
+	uint16be oneshotLength;  // For unlooped samples, this is quite frequently 2 bytes shorter than the sample data length (and the last two samples would cause a click to be heard)
 	uint8be  finetune;
 	uint8be  volume;
 	uint16be loopStart;
@@ -64,7 +64,7 @@
 	void ConvertToMPT(ModSample &mptSmp, uint32 length) const
 	{
 		mptSmp.Initialize(MOD_TYPE_MOD);
-		mptSmp.nLength = length;
+		mptSmp.nLength = (loopLength > 1) ? length : (oneshotLength * 2u);
 		mptSmp.nFineTune = MOD2XMFineTune(finetune);
 		mptSmp.nVolume = 4u * std::min(volume.get(), uint8(64));
 
@@ -434,14 +434,18 @@
 	// Reading samples
 	if(loadFlags & loadSampleData)
 	{
-		for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) if(Samples[smp].nLength)
+		for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++)
 		{
+			if(!sampleLen[smp - 1])
+				continue;
+
+			FileReader chunk = file.ReadChunk(sampleLen[smp - 1]);
 			SampleIO(
 				SampleIO::_8bit,
 				SampleIO::mono,
 				SampleIO::littleEndian,
 				SampleIO::signedPCM)
-				.ReadSample(Samples[smp], file);
+				.ReadSample(Samples[smp], chunk);
 		}
 	}
 

Modified: branches/OpenMPT-1.31/soundlib/Sndmix.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Sndmix.cpp	Mon Aug  5 23:59:00 2024	(r21334)
+++ branches/OpenMPT-1.31/soundlib/Sndmix.cpp	Mon Aug  5 23:59:24 2024	(r21335)
@@ -1592,6 +1592,11 @@
 				uint8 note = (GetType() != MOD_TYPE_MOD) ? chn.nNote : static_cast<uint8>(GetNoteFromPeriod(period, chn.nFineTune, chn.nC5Speed));
 				if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI))
 					tick += 2;
+
+				// SFX uses a 0-1-2-0-2-1 pattern (fixed at 6 ticks per row)
+				if(GetType() == MOD_TYPE_SFX && tick > 3)
+					tick ^= 3;
+
 				switch(tick % 3)
 				{
 				case 1: note += (chn.nArpeggio >> 4); break;
@@ -1614,7 +1619,7 @@
 					}
 					period = GetPeriodFromNote(note, chn.nFineTune, chn.nC5Speed);
 
-					if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI | MOD_TYPE_PSM | MOD_TYPE_STM | MOD_TYPE_OKT))
+					if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI | MOD_TYPE_PSM | MOD_TYPE_STM | MOD_TYPE_OKT | MOD_TYPE_SFX))
 					{
 						// The arpeggio note offset remains effective after the end of the current row in ScreamTracker 2.
 						// This fixes the flute lead in MORPH.STM by Skaven, pattern 27.

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

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

Author: sagamusix
Date: Mon Aug  5 23:59:00 2024
New Revision: 21334
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21334

Log:
[Fix] SFX: Last arpeggio note is held at end of row, and a peculiar 0-1-2-0-2-1 arpeggio table is used. Fixes Bassbomb/ok.sfx (https://www.un4seen.com/forum/?topic=15448.msg143414#msg143414).
[Fix] SFX: Ignore unused data at end of oneshot samples which sometimes caused clicky noises (https://www.un4seen.com/forum/?topic=15448.msg143414#msg143414).

Modified:
   trunk/OpenMPT/soundlib/Load_sfx.cpp
   trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/soundlib/Load_sfx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_sfx.cpp	Mon Aug  5 19:07:00 2024	(r21333)
+++ trunk/OpenMPT/soundlib/Load_sfx.cpp	Mon Aug  5 23:59:00 2024	(r21334)
@@ -54,7 +54,7 @@
 struct SFXSampleHeader
 {
 	char     name[22];
-	char     dummy[2];  // Supposedly sample length, but almost always incorrect
+	uint16be oneshotLength;  // For unlooped samples, this is quite frequently 2 bytes shorter than the sample data length (and the last two samples would cause a click to be heard)
 	uint8be  finetune;
 	uint8be  volume;
 	uint16be loopStart;
@@ -64,7 +64,7 @@
 	void ConvertToMPT(ModSample &mptSmp, uint32 length) const
 	{
 		mptSmp.Initialize(MOD_TYPE_MOD);
-		mptSmp.nLength = length;
+		mptSmp.nLength = (loopLength > 1) ? length : (oneshotLength * 2u);
 		mptSmp.nFineTune = MOD2XMFineTune(finetune);
 		mptSmp.nVolume = 4u * std::min(volume.get(), uint8(64));
 
@@ -433,14 +433,18 @@
 	// Reading samples
 	if(loadFlags & loadSampleData)
 	{
-		for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++) if(Samples[smp].nLength)
+		for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++)
 		{
+			if(!sampleLen[smp - 1])
+				continue;
+
+			FileReader chunk = file.ReadChunk(sampleLen[smp - 1]);
 			SampleIO(
 				SampleIO::_8bit,
 				SampleIO::mono,
 				SampleIO::littleEndian,
 				SampleIO::signedPCM)
-				.ReadSample(Samples[smp], file);
+				.ReadSample(Samples[smp], chunk);
 		}
 	}
 

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	Mon Aug  5 19:07:00 2024	(r21333)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	Mon Aug  5 23:59:00 2024	(r21334)
@@ -1589,6 +1589,11 @@
 				uint8 note = (GetType() != MOD_TYPE_MOD) ? chn.nNote : static_cast<uint8>(GetNoteFromPeriod(period, chn.nFineTune, chn.nC5Speed));
 				if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI))
 					tick += 2;
+
+				// SFX uses a 0-1-2-0-2-1 pattern (fixed at 6 ticks per row)
+				if(GetType() == MOD_TYPE_SFX && tick > 3)
+					tick ^= 3;
+
 				switch(tick % 3)
 				{
 				case 1: note += (chn.nArpeggio >> 4); break;
@@ -1611,7 +1616,7 @@
 					}
 					period = GetPeriodFromNote(note, chn.nFineTune, chn.nC5Speed);
 
-					if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI | MOD_TYPE_PSM | MOD_TYPE_STM | MOD_TYPE_OKT))
+					if(GetType() & (MOD_TYPE_DBM | MOD_TYPE_DIGI | MOD_TYPE_PSM | MOD_TYPE_STM | MOD_TYPE_OKT | MOD_TYPE_SFX))
 					{
 						// The arpeggio note offset remains effective after the end of the current row in ScreamTracker 2.
 						// This fixes the flute lead in MORPH.STM by Skaven, pattern 27.

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

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

Author: sagamusix
Date: Mon Aug  5 19:07:00 2024
New Revision: 21333
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21333

Log:
[Mod] When there was only a partial match between plugin IDs / names, always update both the plugin IDs (already done for VST plugins only) and plugin name (done neither for built-in / DMO / VST) in the SNDMIXPLUGININFO struct.
[Ref] Simplify plugin instance creation code.

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

Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Mon Aug  5 19:06:09 2024	(r21332)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Mon Aug  5 19:07:00 2024	(r21333)
@@ -698,29 +698,22 @@
 		}
 	}
 
-	if(pFound != nullptr && pFound->Create != nullptr)
+	if(!pFound)
+		return false;
+
+	IMixPlugin *plugin = nullptr;
+	if(pFound->Create != nullptr)
 	{
-		IMixPlugin *plugin = pFound->Create(*pFound, sndFile, mixPlugin);
-		if(plugin)
-		{
-			pFound->InsertPluginInstanceIntoList(*plugin);
-		}
-#ifdef MODPLUG_TRACKER
-		CriticalSection cs;
-#endif
-		mixPlugin.pMixPlugin = plugin;
-		return plugin != nullptr;
+		plugin = pFound->Create(*pFound, sndFile, mixPlugin);
 	}
-
 #ifdef MPT_WITH_VST
 	// Note: we don't check if dwPluginId1 matches Vst::kEffectMagic here, even if it should.
 	// I have an old file I made with OpenMPT 1.17 where the primary plugin ID has an unexpected value.
 	// No idea how that could happen, apart from some plugin.cache corruption (back then, the IDs were not re-checked
 	// after instantiating a plugin and the cached plugin ID was blindly written to the module file)
-	if(pFound)
+	else
 	{
 		bool maskCrashes = TrackerSettings::Instance().BrokenPluginsWorkaroundVSTMaskAllCrashes;
-		bool validPlugin = false;
 
 		unsigned long exception = 0;
 		auto loadResult = CVstPlugin::LoadPlugin(maskCrashes, *pFound, TrackerSettings::Instance().bridgeAllPlugins ? CVstPlugin::BridgeMode::ForceBridgeWithFallback : CVstPlugin::BridgeMode::Automatic, exception);
@@ -728,18 +721,11 @@
 
 		if(pEffect != nullptr)
 		{
-			// If filename matched during load but plugin ID didn't, make sure it's updated.
-			mixPlugin.Info.dwPluginId1 = pFound->pluginId1 = loadResult.magic;
-			mixPlugin.Info.dwPluginId2 = pFound->pluginId2 = loadResult.uniqueID;
-
-			CVstPlugin *pVstPlug = new (std::nothrow) CVstPlugin(maskCrashes, loadResult.library, *pFound, mixPlugin, *pEffect, sndFile);
-			if(pVstPlug)
-			{
-				pFound->InsertPluginInstanceIntoList(*pVstPlug);
-			}
-			validPlugin = (pVstPlug != nullptr);
-			CriticalSection cs;
-			mixPlugin.pMixPlugin = pVstPlug;
+			// If filename matched during load but plugin ID didn't (or vice versa), make sure it's updated.
+			pFound->pluginId1 = loadResult.magic;
+			pFound->pluginId2 = loadResult.uniqueID;
+
+			plugin = new (std::nothrow) CVstPlugin(maskCrashes, loadResult.library, *pFound, mixPlugin, *pEffect, sndFile);
 
 #ifdef MODPLUG_TRACKER
 			AddPluginsToList(GetPluginInformation(*pFound, loadResult),
@@ -751,22 +737,26 @@
 #endif
 		}
 
-		if(!validPlugin && loadResult.library)
+		if(!plugin && loadResult.library)
 		{
 			FreeLibrary(loadResult.library);
 			CVstPluginManager::ReportPlugException(MPT_UFORMAT("Unable to create plugin \"{}\"!\n")(pFound->libraryName));
 		}
-		return validPlugin;
-	} else
-	{
-		// "plug not found" notification code MOVED to CSoundFile::Create
-#ifdef VST_LOG
-		MPT_LOG_GLOBAL(LogDebug, "VST", U_("Unknown plugin"));
-#endif
 	}
 #endif // MPT_WITH_VST
 
-	return false;
+#ifdef MODPLUG_TRACKER
+	CriticalSection cs;
+#endif
+	if(plugin)
+		pFound->InsertPluginInstanceIntoList(*plugin);
+	mixPlugin.pMixPlugin = plugin;
+	// If filename matched during load but plugin ID didn't (or vice versa), make sure it's updated.
+	mixPlugin.Info.dwPluginId1 = pFound->pluginId1;
+	mixPlugin.Info.dwPluginId2 = pFound->pluginId2;
+	mixPlugin.Info.szLibraryName = pFound->libraryName.ToUTF8();
+
+	return plugin != nullptr;
 }
 
 

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

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

Author: sagamusix
Date: Mon Aug  5 19:06:09 2024
New Revision: 21332
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21332

Log:
[Ref] mpt::contains is always linear, go back to logarithmic search on set by using .find instead.
[Ref] Silence warning about redundant null check.

Modified:
   trunk/OpenMPT/mptrack/Vstplug.cpp
   trunk/OpenMPT/soundlib/plugins/PluginManager.cpp

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	Mon Aug  5 18:39:07 2024	(r21331)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	Mon Aug  5 19:06:09 2024	(r21332)
@@ -263,7 +263,7 @@
 		while((childID = CVstPlugin::DispatchSEH(maskCrashes, *effect, Vst::effShellGetNextPlugin, 0, 0, name.data(), 0.0f, exception)) != 0)
 		{
 			name[63] = 0;
-			result.shellPlugins.emplace_back(LoadResult::ShellPlugin{name.data(), static_cast<uint32>(childID)});
+			result.shellPlugins.push_back(LoadResult::ShellPlugin{name.data(), static_cast<uint32>(childID)});
 
 			if(static_cast<uint32>(childID) == plugin.shellPluginID)
 				shellPlugIndex = result.shellPlugins.size();

Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Mon Aug  5 18:39:07 2024	(r21331)
+++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp	Mon Aug  5 19:06:09 2024	(r21332)
@@ -815,15 +815,12 @@
 		}
 		updateFunc(*found, updateExisting);
 
-		if(found)
-		{
-			if(!first)
-				first = found;
+		if(!first)
+			first = found;
 			
 #ifdef MODPLUG_TRACKER
-			found->WriteToCache();
+		found->WriteToCache();
 #endif // MODPLUG_TRACKER
-		}
 	}
 
 	// Are there any shell plugins in our list that are no longer part of the shell plugin?
@@ -832,7 +829,7 @@
 		size_t deleted = 0;
 		for(const auto &[id, i] : existingCandidates)
 		{
-			if(!mpt::contains(containedIDs, id) && !pluginList[i - deleted]->pPluginsList)
+			if(auto it = containedIDs.find(id); it == containedIDs.end() && !pluginList[i - deleted]->pPluginsList)
 			{
 				MPT_ASSERT(pluginList[i - deleted]->shellPluginID == id);
 				pluginList.erase(pluginList.begin() + i - deleted);

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

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

Author: manx
Date: Mon Aug  5 18:39:07 2024
New Revision: 21331
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21331

Log:
[Ref] mpt/base/detect_compiler.hpp: Simplify detecting C++ version.
[Reg] mpt/base/detect_compiler.hpp: Remove support for partial C++20 mode with VS2019 /std:c++latest. Just use C++17 mode unconditionally with VS2019.

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

Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Mon Aug  5 15:00:32 2024	(r21330)
+++ trunk/OpenMPT/src/mpt/base/detect_compiler.hpp	Mon Aug  5 18:39:07 2024	(r21331)
@@ -163,7 +163,17 @@
 
 
 
-#if MPT_COMPILER_GENERIC || MPT_COMPILER_GCC || MPT_COMPILER_CLANG
+#if MPT_COMPILER_GENERIC
+
+#if (__cplusplus >= 202302)
+#define MPT_CXX 23
+#elif (__cplusplus >= 202002)
+#define MPT_CXX 20
+#elif (__cplusplus >= 201703)
+#define MPT_CXX 17
+#endif
+
+#elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
 
 #if (__cplusplus >= 202302)
 #define MPT_CXX 23
@@ -176,8 +186,6 @@
 #endif
 #elif (__cplusplus >= 201703)
 #define MPT_CXX 17
-#else
-#define MPT_CXX 17
 #endif
 
 #elif MPT_COMPILER_MSVC
@@ -188,22 +196,15 @@
 #elif (_MSVC_LANG >= 202002)
 #define MPT_CXX 20
 #elif (_MSVC_LANG >= 201703)
-#if MPT_MSVC_AT_LEAST(2019, 10) && (_MSVC_LANG >= 201705)
-#define MPT_CXX 20
-#else
-#define MPT_CXX 17
-#endif
-#else
 #define MPT_CXX 17
 #endif
-#else
-#define MPT_CXX 17
 #endif
 
-#else
+#endif
 
+// default to C++17
+#ifndef MPT_CXX
 #define MPT_CXX 17
-
 #endif
 
 // MPT_CXX is stricter than just using __cplusplus directly.