diff --git a/libs/dll-binaries/i686/libopenmpt.dll b/libs/dll-binaries/i686/libopenmpt.dll index 479114bcd..b3fa2eeab 100644 Binary files a/libs/dll-binaries/i686/libopenmpt.dll and b/libs/dll-binaries/i686/libopenmpt.dll differ diff --git a/libs/dll-binaries/i686/openmpt-mpg123.dll b/libs/dll-binaries/i686/openmpt-mpg123.dll deleted file mode 100644 index 60bc3b958..000000000 Binary files a/libs/dll-binaries/i686/openmpt-mpg123.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/openmpt-ogg.dll b/libs/dll-binaries/i686/openmpt-ogg.dll deleted file mode 100644 index 32df3461a..000000000 Binary files a/libs/dll-binaries/i686/openmpt-ogg.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/openmpt-vorbis.dll b/libs/dll-binaries/i686/openmpt-vorbis.dll deleted file mode 100644 index bb154d167..000000000 Binary files a/libs/dll-binaries/i686/openmpt-vorbis.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/openmpt-zlib.dll b/libs/dll-binaries/i686/openmpt-zlib.dll deleted file mode 100644 index 948bc80f5..000000000 Binary files a/libs/dll-binaries/i686/openmpt-zlib.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/libopenmpt.dll b/libs/dll-binaries/x86_64/libopenmpt.dll index 05c4237a7..97f768a62 100644 Binary files a/libs/dll-binaries/x86_64/libopenmpt.dll and b/libs/dll-binaries/x86_64/libopenmpt.dll differ diff --git a/libs/dll-binaries/x86_64/openmpt-mpg123.dll b/libs/dll-binaries/x86_64/openmpt-mpg123.dll deleted file mode 100644 index c917604df..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-mpg123.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/openmpt-ogg.dll b/libs/dll-binaries/x86_64/openmpt-ogg.dll deleted file mode 100644 index de503b03f..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-ogg.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/openmpt-vorbis.dll b/libs/dll-binaries/x86_64/openmpt-vorbis.dll deleted file mode 100644 index 5f21dee26..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-vorbis.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/openmpt-zlib.dll b/libs/dll-binaries/x86_64/openmpt-zlib.dll deleted file mode 100644 index 1ae938ff7..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-zlib.dll and /dev/null differ diff --git a/libs/libopenmpt/inc/libopenmpt/libopenmpt.h b/libs/libopenmpt/inc/libopenmpt/libopenmpt.h index 912cf04da..88425b5bb 100644 --- a/libs/libopenmpt/inc/libopenmpt/libopenmpt.h +++ b/libs/libopenmpt/inc/libopenmpt/libopenmpt.h @@ -1421,7 +1421,7 @@ LIBOPENMPT_API const char * openmpt_module_highlight_pattern_row_channel( openmp * - subsong (integer): The current subsong. Setting it has identical semantics as openmpt_module_select_subsong(), getting it returns the currently selected subsong. * - play.at_end (text): Chooses the behaviour when the end of song is reached. The song end is considered to be reached after the number of reptitions set by openmpt_module_set_repeat_count was played, so if the song is set to repeat infinitely, its end is never considered to be reached. * - "fadeout": Fades the module out for a short while. Subsequent reads after the fadeout will return 0 rendered frames. - * - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumsed from the song start). + * - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumed from the song start). * - "stop": Returns 0 rendered frames when the song end is reached. Subsequent reads will return 0 rendered frames. * - play.tempo_factor (floatingpoint): Set a floating point tempo factor. "1.0" is the default tempo. * - play.pitch_factor (floatingpoint): Set a floating point pitch factor. "1.0" is the default pitch. diff --git a/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp b/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp index 69784e8ea..35b19a9e5 100644 --- a/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp +++ b/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp @@ -1074,7 +1074,7 @@ public: - subsong (integer): The current subsong. Setting it has identical semantics as openmpt::module::select_subsong(), getting it returns the currently selected subsong. - play.at_end (text): Chooses the behaviour when the end of song is reached. The song end is considered to be reached after the number of reptitions set by openmpt::module::set_repeat_count was played, so if the song is set to repeat infinitely, its end is never considered to be reached. - "fadeout": Fades the module out for a short while. Subsequent reads after the fadeout will return 0 rendered frames. - - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumsed from the song start). + - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumed from the song start). - "stop": Returns 0 rendered frames when the song end is reached. Subsequent reads will return 0 rendered frames. - play.tempo_factor (floatingpoint): Set a floating point tempo factor. "1.0" is the default tempo. - play.pitch_factor (floatingpoint): Set a floating point pitch factor. "1.0" is the default pitch. diff --git a/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h b/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h index d006c9ed3..08ff71169 100644 --- a/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h +++ b/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h @@ -21,7 +21,7 @@ /*! \brief libopenmpt minor version number */ #define OPENMPT_API_VERSION_MINOR 7 /*! \brief libopenmpt patch version number */ -#define OPENMPT_API_VERSION_PATCH 3 +#define OPENMPT_API_VERSION_PATCH 5 /*! \brief libopenmpt pre-release tag */ #define OPENMPT_API_VERSION_PREREL "" /*! \brief libopenmpt pre-release flag */ diff --git a/libs/libopenmpt/lib/x86/libopenmpt.lib b/libs/libopenmpt/lib/x86/libopenmpt.lib index 6f42fb2b0..5cc0d1ab9 100644 Binary files a/libs/libopenmpt/lib/x86/libopenmpt.lib and b/libs/libopenmpt/lib/x86/libopenmpt.lib differ diff --git a/libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a b/libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a new file mode 100644 index 000000000..4b1d695e7 Binary files /dev/null and b/libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a differ diff --git a/libs/libopenmpt/lib/x86_64/libopenmpt.lib b/libs/libopenmpt/lib/x86_64/libopenmpt.lib index e2d30a94d..7699529fb 100644 Binary files a/libs/libopenmpt/lib/x86_64/libopenmpt.lib and b/libs/libopenmpt/lib/x86_64/libopenmpt.lib differ diff --git a/libs/libopenmpt/lib/x86_64/mingw/libopenmpt.dll.a b/libs/libopenmpt/lib/x86_64/mingw/libopenmpt.dll.a new file mode 100644 index 000000000..19e90d8c0 Binary files /dev/null and b/libs/libopenmpt/lib/x86_64/mingw/libopenmpt.dll.a differ