Menu
▾
▴
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
|
|
From: <sv...@op...> - 2024-03-07 08:09:51
|
Author: manx Date: Thu Mar 7 09:09:45 2024 New Revision: 20259 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20259 Log: [Fix] build: Makefile: macOS: Assume cross-compiling when specifying ARCH=. [Fix] build: Makefile: macOS: Fix copy-paste-error. Modified: trunk/OpenMPT/build/make/config-macos.mk Modified: trunk/OpenMPT/build/make/config-macos.mk ============================================================================== --- trunk/OpenMPT/build/make/config-macos.mk Thu Mar 7 08:34:41 2024 (r20258) +++ trunk/OpenMPT/build/make/config-macos.mk Thu Mar 7 09:09:45 2024 (r20259) @@ -10,7 +10,6 @@ # 10.13 .. ifeq ($(MACOSX_VERSION_MIN),) else -MPT_OS_MACOSX_OR_IOS CFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) CXXFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) @@ -19,6 +18,7 @@ # arm64/x86_64/i386 ifeq ($(ARCH),) else +IS_CROSS=1 CFLAGS += -arch $(ARCH) CXXFLAGS += -arch $(ARCH) LDFLAGS += -arch $(ARCH) |
|
From: <sv...@op...> - 2024-03-07 07:34:51
|
Author: manx Date: Thu Mar 7 08:34:41 2024 New Revision: 20258 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20258 Log: [Fix] build: Makefile: Clang: Set -Wno-unused-but-set-variable for external code. Modified: trunk/OpenMPT/build/make/warnings-clang.mk Modified: trunk/OpenMPT/build/make/warnings-clang.mk ============================================================================== --- trunk/OpenMPT/build/make/warnings-clang.mk Wed Mar 6 17:56:22 2024 (r20257) +++ trunk/OpenMPT/build/make/warnings-clang.mk Thu Mar 7 08:34:41 2024 (r20258) @@ -24,6 +24,7 @@ CFLAGS_SILENT += -Wno-frame-larger-than CFLAGS_SILENT += -Wno-missing-prototypes CFLAGS_SILENT += -Wno-sign-compare +CFLAGS_SILENT += -Wno-unused-but-set-variable CFLAGS_SILENT += -Wno-unused-function CFLAGS_SILENT += -Wno-unused-parameter CFLAGS_SILENT += -Wno-unused-variable |
|
From: <sv...@op...> - 2024-03-06 16:56:34
|
Author: manx Date: Wed Mar 6 17:56:22 2024 New Revision: 20257 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20257 Log: [Imp] build: Makefile: Add explicit CONFIG=macos and provide MACOSX_VERSION_MIN= and ARCH= options. Added: trunk/OpenMPT/build/make/config-macos.mk (contents, props changed) Modified: trunk/OpenMPT/build/make/config-defaults.mk Modified: trunk/OpenMPT/build/make/config-defaults.mk ============================================================================== --- trunk/OpenMPT/build/make/config-defaults.mk Wed Mar 6 17:53:23 2024 (r20256) +++ trunk/OpenMPT/build/make/config-defaults.mk Wed Mar 6 17:56:22 2024 (r20257) @@ -3,13 +3,7 @@ ifeq ($(HOST_FLAVOUR),MACOSX) -NO_PULSEAUDIO?=1 -include build/make/config-clang.mk -# Mac OS X overrides -DYNLINK=0 -SHARED_SONAME=0 -MPT_COMPILER_NOSECTIONS=1 -MPT_COMPILER_NOGCSECTIONS=1 +include build/make/config-macos.mk else ifeq ($(HOST_FLAVOUR),MSYS2) Added: trunk/OpenMPT/build/make/config-macos.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/build/make/config-macos.mk Wed Mar 6 17:56:22 2024 (r20257) @@ -0,0 +1,26 @@ + +NO_PULSEAUDIO?=1 +include build/make/config-clang.mk +# Mac OS X overrides +DYNLINK=0 +SHARED_SONAME=0 +MPT_COMPILER_NOSECTIONS=1 +MPT_COMPILER_NOGCSECTIONS=1 + +# 10.13 .. +ifeq ($(MACOSX_VERSION_MIN),) +else +MPT_OS_MACOSX_OR_IOS +CFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) +CXXFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) +LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) +endif + +# arm64/x86_64/i386 +ifeq ($(ARCH),) +else +CFLAGS += -arch $(ARCH) +CXXFLAGS += -arch $(ARCH) +LDFLAGS += -arch $(ARCH) +endif + |
|
From: <sv...@op...> - 2024-03-06 16:53:31
|
Author: manx Date: Wed Mar 6 17:53:23 2024 New Revision: 20256 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20256 Log: [New] build: CI: GitHub: Add macOS 14 runner. Added: trunk/OpenMPT/.github/workflows/macOS-14-Makefile.yml Added: trunk/OpenMPT/.github/workflows/macOS-14-Makefile.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/macOS-14-Makefile.yml Wed Mar 6 17:53:23 2024 (r20256) @@ -0,0 +1,27 @@ +name: macOS 14 Makefile + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + build: + + runs-on: macos-14 + + steps: + - uses: actions/checkout@v4 + - name: install dependencies + run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 + - name: setup parallel make + run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV + - name: make + run: make STRICT=1 FORCE_DEPS=1 + - name: make check + run: make STRICT=1 FORCE_DEPS=1 check |
|
From: <sv...@op...> - 2024-03-05 19:33:29
|
Author: sagamusix Date: Tue Mar 5 20:33:17 2024 New Revision: 20255 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20255 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Tue Mar 5 20:26:54 2024 (r20254) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Tue Mar 5 20:33:17 2024 (r20255) @@ -7,6 +7,8 @@ ### libopenmpt 0.7.5-pre + * xmp-openmpt: Metadata retrievel for playlist items was broken. + ### libopenmpt 0.7.4 (2024-03-03) * [**Bug**] Makefile: libopenmpt 0.7.3 broke running the test suite for |
|
From: <sv...@op...> - 2024-03-05 19:27:01
|
Author: sagamusix Date: Tue Mar 5 20:26:54 2024 New Revision: 20254 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20254 Log: Merged revision(s) 20253 from trunk/OpenMPT: [Fix] xmp-openmpt: Song metadata retrieval was completely broken for playlist entries. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Modified: branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp ============================================================================== --- branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Tue Mar 5 20:25:55 2024 (r20253) +++ branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Tue Mar 5 20:26:54 2024 (r20254) @@ -731,17 +731,38 @@ return result; } -static float * build_xmplay_length( const openmpt::module & /* mod */ ) { - float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * self->subsong_lengths.size() ) ); +static std::vector<double> build_subsong_lengths( openmpt::module & mod ) { + std::int32_t num_subsongs = mod.get_num_subsongs(); + std::vector<double> subsong_lengths( num_subsongs ); + for ( std::int32_t i = 0; i < num_subsongs; ++i ) { + mod.select_subsong( i ); + subsong_lengths[i] = mod.get_duration_seconds(); + } + return subsong_lengths; +} + +static float * build_xmplay_length( openmpt::module & mod ) { + const auto subsong_lengths = build_subsong_lengths( mod ); + float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * subsong_lengths.size() ) ); if ( !result ) { return nullptr; } - for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) { - result[i] = static_cast<float>( self->subsong_lengths[i] ); + for ( std::size_t i = 0; i < subsong_lengths.size(); ++i ) { + result[i] = static_cast<float>( subsong_lengths[i] ); } return result; } +static DWORD build_xmplay_file_info( openmpt::module & mod, float ** length, char ** tags ) { + if ( length ) { + *length = build_xmplay_length( mod ); + } + if ( tags ) { + *tags = build_xmplay_tags( mod ); + } + return static_cast<DWORD>( mod.get_num_subsongs() ); +} + static void clear_xmplay_string( char * str ) { if ( !str ) { return; @@ -851,6 +872,7 @@ static DWORD WINAPI openmpt_GetFileInfo( const char * filename, XMPFILE file, float * * length, char * * tags ) { static_cast<void>( filename ); + DWORD subsongs = 0; try { std::map< std::string, std::string > ctls { @@ -863,12 +885,7 @@ case XMPFILE_TYPE_MEMORY: { openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } break; case XMPFILE_TYPE_FILE: @@ -878,50 +895,30 @@ { xmplay_istream s( file ); openmpt::module mod( s, std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } break; } #else if ( xmpffile->GetType( file ) == XMPFILE_TYPE_MEMORY ) { openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } else { openmpt::module mod( read_XMPFILE_vector( file ), std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } #endif #else std::ifstream s( filename, std::ios_base::binary ); openmpt::module mod( s, std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } - #endif + subsongs = build_xmplay_file_info( mod, length, tags ); +#endif } catch ( ... ) { if ( length ) *length = nullptr; if ( tags ) *tags = nullptr; return 0; } - return self->subsong_lengths.size() + XMPIN_INFO_NOSUBTAGS; + return subsongs; } // open a file for playback @@ -967,12 +964,7 @@ reset_timeinfos(); apply_options(); - std::int32_t num_subsongs = self->mod->get_num_subsongs(); - self->subsong_lengths.resize( num_subsongs ); - for ( std::int32_t i = 0; i < num_subsongs; ++i ) { - self->mod->select_subsong( i ); - self->subsong_lengths[i] = self->mod->get_duration_seconds(); - } + self->subsong_lengths = build_subsong_lengths( *self->mod ); self->subsong_names = self->mod->get_subsong_names(); self->mod->select_subsong( 0 ); self->tempo_factor = 0; |
|
From: <sv...@op...> - 2024-03-05 19:26:10
|
Author: sagamusix Date: Tue Mar 5 20:25:55 2024 New Revision: 20253 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20253 Log: [Fix] xmp-openmpt: Song metadata retrieval was completely broken for playlist entries. Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Tue Mar 5 19:28:07 2024 (r20252) +++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Tue Mar 5 20:25:55 2024 (r20253) @@ -731,17 +731,38 @@ return result; } -static float * build_xmplay_length( const openmpt::module & /* mod */ ) { - float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * self->subsong_lengths.size() ) ); +static std::vector<double> build_subsong_lengths( openmpt::module & mod ) { + std::int32_t num_subsongs = mod.get_num_subsongs(); + std::vector<double> subsong_lengths( num_subsongs ); + for ( std::int32_t i = 0; i < num_subsongs; ++i ) { + mod.select_subsong( i ); + subsong_lengths[i] = mod.get_duration_seconds(); + } + return subsong_lengths; +} + +static float * build_xmplay_length( openmpt::module & mod ) { + const auto subsong_lengths = build_subsong_lengths( mod ); + float * result = static_cast<float*>( xmpfmisc->Alloc( sizeof( float ) * subsong_lengths.size() ) ); if ( !result ) { return nullptr; } - for ( std::size_t i = 0; i < self->subsong_lengths.size(); ++i ) { - result[i] = static_cast<float>( self->subsong_lengths[i] ); + for ( std::size_t i = 0; i < subsong_lengths.size(); ++i ) { + result[i] = static_cast<float>( subsong_lengths[i] ); } return result; } +static DWORD build_xmplay_file_info( openmpt::module & mod, float ** length, char ** tags ) { + if ( length ) { + *length = build_xmplay_length( mod ); + } + if ( tags ) { + *tags = build_xmplay_tags( mod ); + } + return static_cast<DWORD>( mod.get_num_subsongs() ); +} + static void clear_xmplay_string( char * str ) { if ( !str ) { return; @@ -851,6 +872,7 @@ static DWORD WINAPI openmpt_GetFileInfo( const char * filename, XMPFILE file, float * * length, char * * tags ) { static_cast<void>( filename ); + DWORD subsongs = 0; try { std::map< std::string, std::string > ctls { @@ -863,12 +885,7 @@ case XMPFILE_TYPE_MEMORY: { openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } break; case XMPFILE_TYPE_FILE: @@ -878,50 +895,30 @@ { xmplay_istream s( file ); openmpt::module mod( s, std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } break; } #else if ( xmpffile->GetType( file ) == XMPFILE_TYPE_MEMORY ) { openmpt::module mod( xmpffile->GetMemory( file ), xmpffile->GetSize( file ), std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } else { openmpt::module mod( read_XMPFILE_vector( file ), std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } + subsongs = build_xmplay_file_info( mod, length, tags ); } #endif #else std::ifstream s( filename, std::ios_base::binary ); openmpt::module mod( s, std::clog, ctls ); - if ( length ) { - *length = build_xmplay_length( mod ); - } - if ( tags ) { - *tags = build_xmplay_tags( mod ); - } - #endif + subsongs = build_xmplay_file_info( mod, length, tags ); +#endif } catch ( ... ) { if ( length ) *length = nullptr; if ( tags ) *tags = nullptr; return 0; } - return self->subsong_lengths.size() + XMPIN_INFO_NOSUBTAGS; + return subsongs; } // open a file for playback @@ -967,12 +964,7 @@ reset_timeinfos(); apply_options(); - std::int32_t num_subsongs = self->mod->get_num_subsongs(); - self->subsong_lengths.resize( num_subsongs ); - for ( std::int32_t i = 0; i < num_subsongs; ++i ) { - self->mod->select_subsong( i ); - self->subsong_lengths[i] = self->mod->get_duration_seconds(); - } + self->subsong_lengths = build_subsong_lengths( *self->mod ); self->subsong_names = self->mod->get_subsong_names(); self->mod->select_subsong( 0 ); self->tempo_factor = 0; |
|
From: <sv...@op...> - 2024-03-05 18:28:19
|
Author: sagamusix Date: Tue Mar 5 19:28:07 2024 New Revision: 20252 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20252 Log: [Imp] MPT Hacks: Warn about S3Ms using extended OPL3 waveforms (as it was possible in early OpenMPT builds with OPL support) [Imp] MPT Hacks: "The" compatible playback flag is not used anymore. Warn about individual settings not being set to their default values. Modified: trunk/OpenMPT/mptrack/MPTHacks.cpp Modified: trunk/OpenMPT/mptrack/MPTHacks.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MPTHacks.cpp Tue Mar 5 19:27:08 2024 (r20251) +++ trunk/OpenMPT/mptrack/MPTHacks.cpp Tue Mar 5 19:28:07 2024 (r20252) @@ -22,7 +22,7 @@ // Find and fix envelopes where two nodes are on the same tick. -bool FindIncompatibleEnvelopes(InstrumentEnvelope &env, bool autofix) +static bool FindIncompatibleEnvelopes(InstrumentEnvelope &env, bool autofix) { bool found = false; for(uint32 i = 1; i < env.size(); i++) @@ -270,6 +270,7 @@ // Check for sample extensions foundHere = false; + bool opl3inS3M = false; for(SAMPLEINDEX i = 1; i <= m_SndFile.GetNumSamples(); i++) { ModSample &smp = m_SndFile.GetSample(i); @@ -277,16 +278,27 @@ { foundHere = foundHacks = true; if(autofix) - { ctrlSmp::ConvertToMono(smp, m_SndFile, ctrlSmp::mixChannels); - } else + } else if(modType == MOD_TYPE_S3M && smp.uFlags[CHN_ADLIB]) + { + if(smp.adlib[8] >= 4) { - break; + opl3inS3M = foundHacks = true; + if(autofix) + smp.adlib[8] = 0; + } + if(smp.adlib[9] >= 4) + { + opl3inS3M = foundHacks = true; + if(autofix) + smp.adlib[9] = 0; } } } if(foundHere) AddToLog("Stereo samples are not supported in the original XM format"); + if(opl3inS3M) + AddToLog("Extended OPL3 waveforms should not be used in the S3M format"); // Check for too many instruments if(m_SndFile.GetNumInstruments() > originalSpecs->instrumentsMax) @@ -336,7 +348,7 @@ if(foundHere) AddToLog("Found MPT instrument extensions"); if(foundEnvelopes) - AddToLog("Two envelope points may not share the same tick."); + AddToLog("Two envelope points may not share the same tick"); // Check for too many orders if(m_SndFile.Order().GetLengthTailTrimmed() > originalSpecs->ordersMax) @@ -420,9 +432,9 @@ } // Player flags - if((modType & (MOD_TYPE_XM|MOD_TYPE_IT)) && !m_SndFile.m_playBehaviour[MSF_COMPATIBLE_PLAY]) + if((modType & (MOD_TYPE_XM|MOD_TYPE_IT)) && m_SndFile.m_playBehaviour != m_SndFile.GetDefaultPlaybackBehaviour(modType)) { - AddToLog("Compatible play is deactivated"); + AddToLog("Some playback compatibility settings are not at their defaults"); foundHacks = true; if(autofix) m_SndFile.SetDefaultPlaybackBehaviour(modType); |
|
From: <sv...@op...> - 2024-03-05 18:27:18
|
Author: sagamusix Date: Tue Mar 5 19:27:08 2024 New Revision: 20251 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20251 Log: [Mod] Pattern tab: Also abort merge operation if pattern lengths wouldn't change after the user chose a custom pattern length. Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_pat.cpp Tue Mar 5 11:52:24 2024 (r20250) +++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp Tue Mar 5 19:27:08 2024 (r20251) @@ -939,7 +939,8 @@ return; } patternSize = static_cast<ROWINDEX>(dlg.resultAsInt); - } else if(minPatternSize == maxPatternSize && minPatternSize == patternSize) + } + if(minPatternSize == maxPatternSize && minPatternSize == patternSize) { MessageBeep(MB_ICONWARNING); SwitchToView(); |
|
From: <sv...@op...> - 2024-03-05 10:52:31
|
Author: manx Date: Tue Mar 5 11:52:24 2024 New Revision: 20250 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20250 Log: Merged revision(s) 20246 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Update FreeBSD to 13.3. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.cirrus.yml Modified: branches/OpenMPT-1.28/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.28/.cirrus.yml Tue Mar 5 11:52:05 2024 (r20249) +++ branches/OpenMPT-1.28/.cirrus.yml Tue Mar 5 11:52:24 2024 (r20250) @@ -1,15 +1,15 @@ task: - name: freebsd-13-2 + name: freebsd-13-3 freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-2-minimal + name: freebsd-13-3-minimal freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-05 10:52:16
|
Author: manx Date: Tue Mar 5 11:52:05 2024 New Revision: 20249 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20249 Log: Merged revision(s) 20246 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Update FreeBSD to 13.3. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.cirrus.yml Modified: branches/OpenMPT-1.29/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.29/.cirrus.yml Tue Mar 5 11:51:47 2024 (r20248) +++ branches/OpenMPT-1.29/.cirrus.yml Tue Mar 5 11:52:05 2024 (r20249) @@ -1,15 +1,15 @@ task: - name: freebsd-13-2 + name: freebsd-13-3 freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-2-minimal + name: freebsd-13-3-minimal freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-05 10:52:03
|
Author: manx Date: Tue Mar 5 11:51:47 2024 New Revision: 20248 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20248 Log: Merged revision(s) 20246 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Update FreeBSD to 13.3. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/.cirrus.yml Modified: branches/OpenMPT-1.30/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.30/.cirrus.yml Tue Mar 5 11:51:28 2024 (r20247) +++ branches/OpenMPT-1.30/.cirrus.yml Tue Mar 5 11:51:47 2024 (r20248) @@ -1,15 +1,15 @@ task: - name: freebsd-13-2 + name: freebsd-13-3 freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-2-minimal + name: freebsd-13-3-minimal freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-05 10:51:35
|
Author: manx Date: Tue Mar 5 11:51:28 2024 New Revision: 20247 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20247 Log: Merged revision(s) 20246 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Update FreeBSD to 13.3. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.cirrus.yml Modified: branches/OpenMPT-1.31/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.31/.cirrus.yml Tue Mar 5 11:51:07 2024 (r20246) +++ branches/OpenMPT-1.31/.cirrus.yml Tue Mar 5 11:51:28 2024 (r20247) @@ -15,17 +15,17 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check task: - name: freebsd-13-2 + name: freebsd-13-3 freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-2-minimal + name: freebsd-13-3-minimal freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-05 10:51:22
|
Author: manx Date: Tue Mar 5 11:51:07 2024 New Revision: 20246 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20246 Log: [Fix] build: CI: Cirrus-CI: Update FreeBSD to 13.3. Modified: trunk/OpenMPT/.cirrus.yml Modified: trunk/OpenMPT/.cirrus.yml ============================================================================== --- trunk/OpenMPT/.cirrus.yml Mon Mar 4 19:03:43 2024 (r20245) +++ trunk/OpenMPT/.cirrus.yml Tue Mar 5 11:51:07 2024 (r20246) @@ -15,17 +15,17 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check task: - name: freebsd-13-2 + name: freebsd-13-3 freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-2-minimal + name: freebsd-13-3-minimal freebsd_instance: - image_family: freebsd-13-2-snap + image_family: freebsd-13-3 install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-04 18:10:37
|
Author: sagamusix Date: Mon Mar 4 19:03:19 2024 New Revision: 20244 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20244 Log: [Imp] Add missing mnemonics in Raw Sample Import dialog. Modified: trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Mon Mar 4 16:12:33 2024 (r20243) +++ trunk/OpenMPT/mptrack/mptrack.rc Mon Mar 4 19:03:19 2024 (r20244) @@ -1394,10 +1394,10 @@ GROUPBOX "",IDC_STATIC,180,18,66,34,WS_GROUP CONTROL "&Little Endian",IDC_RADIO11,"Button",BS_AUTORADIOBUTTON,186,26,54,10 CONTROL "&Big Endian",IDC_RADIO12,"Button",BS_AUTORADIOBUTTON,186,39,54,10 - LTEXT "Offset (Bytes):",IDC_STATIC,120,63,50,8 + LTEXT "Offse&t (Bytes):",IDC_STATIC,120,63,50,8 EDITTEXT IDC_EDIT1,174,60,60,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,234,60,11,14 - CONTROL "Remember these settings",IDC_CHK_REMEMBERSETTINGS, + CONTROL "&Remember these settings",IDC_CHK_REMEMBERSETTINGS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,85,156,12 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,102,234,1 END |
|
From: <sv...@op...> - 2024-03-04 18:10:32
|
Author: sagamusix Date: Mon Mar 4 19:03:43 2024 New Revision: 20245 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20245 Log: Merged revision(s) 20244 from trunk/OpenMPT: [Imp] Add missing mnemonics in Raw Sample Import dialog. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/mptrack.rc Modified: branches/OpenMPT-1.31/mptrack/mptrack.rc ============================================================================== --- branches/OpenMPT-1.31/mptrack/mptrack.rc Mon Mar 4 19:03:19 2024 (r20244) +++ branches/OpenMPT-1.31/mptrack/mptrack.rc Mon Mar 4 19:03:43 2024 (r20245) @@ -1389,10 +1389,10 @@ GROUPBOX "",IDC_STATIC,180,18,66,34,WS_GROUP CONTROL "&Little Endian",IDC_RADIO11,"Button",BS_AUTORADIOBUTTON,186,26,54,10 CONTROL "&Big Endian",IDC_RADIO12,"Button",BS_AUTORADIOBUTTON,186,39,54,10 - LTEXT "Offset (Bytes):",IDC_STATIC,120,63,50,8 + LTEXT "Offse&t (Bytes):",IDC_STATIC,120,63,50,8 EDITTEXT IDC_EDIT1,174,60,60,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,234,60,11,14 - CONTROL "Remember these settings",IDC_CHK_REMEMBERSETTINGS, + CONTROL "&Remember these settings",IDC_CHK_REMEMBERSETTINGS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,85,156,12 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,102,234,1 END |
|
From: <sv...@op...> - 2024-03-04 15:12:40
|
Author: manx Date: Mon Mar 4 16:12:33 2024 New Revision: 20243 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20243 Log: Merged revision(s) 20242 from branches/OpenMPT-1.29: [New] build: CI: GitHub: CPA: Add FreeBSD 13.2. ........ Added: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml - copied, changed from r20242, branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml Modified: branches/OpenMPT-1.28/ (props changed) Copied and modified: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml (from r20242, branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml) ============================================================================== --- branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml Mon Mar 4 16:11:55 2024 (r20242, copy source) +++ branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml Mon Mar 4 16:12:33 2024 (r20243) @@ -2,7 +2,7 @@ on: push: - branches: [ OpenMPT-1.29 ] + branches: [ OpenMPT-1.28 ] concurrency: group: ${{ github.ref }}-${{ github.workflow }} |
|
From: <sv...@op...> - 2024-03-04 15:12:03
|
Author: manx Date: Mon Mar 4 16:11:55 2024 New Revision: 20242 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20242 Log: [New] build: CI: GitHub: CPA: Add FreeBSD 13.2. Added: branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml - copied, changed from r20235, branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml Copied and modified: branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml (from r20235, branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml) ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.2-Makefile.yml Mon Mar 4 11:30:58 2024 (r20235, copy source) +++ branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.2-Makefile.yml Mon Mar 4 16:11:55 2024 (r20242) @@ -2,7 +2,7 @@ on: push: - branches: [ OpenMPT-1.30 ] + branches: [ OpenMPT-1.29 ] concurrency: group: ${{ github.ref }}-${{ github.workflow }} |
|
From: <sv...@op...> - 2024-03-04 15:09:17
|
Author: manx Date: Mon Mar 4 16:09:04 2024 New Revision: 20241 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20241 Log: Merged revision(s) 20237 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Work-around <https://github.com/cirruslabs/cirrus-ci-docs/issues/1265> by using freebsd-13-2-snap. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.cirrus.yml Modified: branches/OpenMPT-1.28/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.28/.cirrus.yml Mon Mar 4 16:08:43 2024 (r20240) +++ branches/OpenMPT-1.28/.cirrus.yml Mon Mar 4 16:09:04 2024 (r20241) @@ -1,7 +1,7 @@ task: name: freebsd-13-2 freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check @@ -9,7 +9,7 @@ task: name: freebsd-13-2-minimal freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-04 15:08:49
|
Author: manx Date: Mon Mar 4 16:08:43 2024 New Revision: 20240 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20240 Log: Merged revision(s) 20237 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Work-around <https://github.com/cirruslabs/cirrus-ci-docs/issues/1265> by using freebsd-13-2-snap. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.cirrus.yml Modified: branches/OpenMPT-1.29/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.29/.cirrus.yml Mon Mar 4 16:08:23 2024 (r20239) +++ branches/OpenMPT-1.29/.cirrus.yml Mon Mar 4 16:08:43 2024 (r20240) @@ -1,7 +1,7 @@ task: name: freebsd-13-2 freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check @@ -9,7 +9,7 @@ task: name: freebsd-13-2-minimal freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-04 15:08:34
|
Author: manx Date: Mon Mar 4 16:08:23 2024 New Revision: 20239 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20239 Log: Merged revision(s) 20237 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Work-around <https://github.com/cirruslabs/cirrus-ci-docs/issues/1265> by using freebsd-13-2-snap. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/.cirrus.yml Modified: branches/OpenMPT-1.30/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.30/.cirrus.yml Mon Mar 4 16:08:00 2024 (r20238) +++ branches/OpenMPT-1.30/.cirrus.yml Mon Mar 4 16:08:23 2024 (r20239) @@ -1,7 +1,7 @@ task: name: freebsd-13-2 freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check @@ -9,7 +9,7 @@ task: name: freebsd-13-2-minimal freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-04 15:08:12
|
Author: manx Date: Mon Mar 4 16:08:00 2024 New Revision: 20238 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20238 Log: Merged revision(s) 20237 from trunk/OpenMPT: [Fix] build: CI: Cirrus-CI: Work-around <https://github.com/cirruslabs/cirrus-ci-docs/issues/1265> by using freebsd-13-2-snap. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.cirrus.yml Modified: branches/OpenMPT-1.31/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.31/.cirrus.yml Mon Mar 4 15:43:47 2024 (r20237) +++ branches/OpenMPT-1.31/.cirrus.yml Mon Mar 4 16:08:00 2024 (r20238) @@ -17,7 +17,7 @@ task: name: freebsd-13-2 freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check @@ -25,7 +25,7 @@ task: name: freebsd-13-2-minimal freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-04 14:43:57
|
Author: manx Date: Mon Mar 4 15:43:47 2024 New Revision: 20237 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20237 Log: [Fix] build: CI: Cirrus-CI: Work-around <https://github.com/cirruslabs/cirrus-ci-docs/issues/1265> by using freebsd-13-2-snap. Modified: trunk/OpenMPT/.cirrus.yml Modified: trunk/OpenMPT/.cirrus.yml ============================================================================== --- trunk/OpenMPT/.cirrus.yml Mon Mar 4 13:34:19 2024 (r20236) +++ trunk/OpenMPT/.cirrus.yml Mon Mar 4 15:43:47 2024 (r20237) @@ -17,7 +17,7 @@ task: name: freebsd-13-2 freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check @@ -25,7 +25,7 @@ task: name: freebsd-13-2-minimal freebsd_instance: - image_family: freebsd-13-2 + image_family: freebsd-13-2-snap install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-04 12:34:27
|
Author: manx Date: Mon Mar 4 13:34:19 2024 New Revision: 20236 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20236 Log: [Ref] build: Makefile: Clang: Enable -Wexit-time-destructors. Modified: trunk/OpenMPT/build/make/warnings-clang.mk trunk/OpenMPT/common/ComponentManager.h trunk/OpenMPT/common/mptRandom.cpp Modified: trunk/OpenMPT/build/make/warnings-clang.mk ============================================================================== --- trunk/OpenMPT/build/make/warnings-clang.mk Mon Mar 4 11:30:58 2024 (r20235) +++ trunk/OpenMPT/build/make/warnings-clang.mk Mon Mar 4 13:34:19 2024 (r20236) @@ -2,8 +2,8 @@ CXXFLAGS_WARNINGS += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-conversion -Wmissing-prototypes -Wshift-count-negative -Wshift-count-overflow -Wshift-op-parentheses -Wshift-overflow -Wshift-sign-overflow -Wundef CFLAGS_WARNINGS += -Wcast-align -Wcast-qual -Wdouble-promotion -Wfloat-conversion -Wmissing-prototypes -Wshift-count-negative -Wshift-count-overflow -Wshift-op-parentheses -Wshift-overflow -Wshift-sign-overflow -Wundef -CXXFLAGS_WARNINGS += -Wdeprecated -Wextra-semi -Wframe-larger-than=16000 -Wglobal-constructors -Wimplicit-fallthrough -Wmissing-declarations -Wnon-virtual-dtor -Wreserved-id-macro -CFLAGS_WARNINGS += -Wframe-larger-than=4000 +CXXFLAGS_WARNINGS += -Wdeprecated -Wexit-time-destructors -Wextra-semi -Wframe-larger-than=16000 -Wglobal-constructors -Wimplicit-fallthrough -Wmissing-declarations -Wnon-virtual-dtor -Wreserved-id-macro +CFLAGS_WARNINGS += -Wframe-larger-than=4000 #CXXFLAGS_WARNINGS += -Wfloat-equal #CXXFLAGS_WARNINGS += -Wdocumentation Modified: trunk/OpenMPT/common/ComponentManager.h ============================================================================== --- trunk/OpenMPT/common/ComponentManager.h Mon Mar 4 11:30:58 2024 (r20235) +++ trunk/OpenMPT/common/ComponentManager.h Mon Mar 4 13:34:19 2024 (r20236) @@ -438,8 +438,15 @@ template <typename type> std::shared_ptr<const type> GetComponent() { +#if MPT_COMPILER_CLANG +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wexit-time-destructors" +#endif // MPT_COMPILER_CLANG static std::weak_ptr<type> cache; static mpt::mutex m; +#if MPT_COMPILER_CLANG +#pragma clang diagnostic pop +#endif // MPT_COMPILER_CLANG mpt::lock_guard<mpt::mutex> l(m); mpt::lock_guard<mpt::mutex> l(m); std::shared_ptr<type> component = cache.lock(); if(!component) Modified: trunk/OpenMPT/common/mptRandom.cpp ============================================================================== --- trunk/OpenMPT/common/mptRandom.cpp Mon Mar 4 11:30:58 2024 (r20235) +++ trunk/OpenMPT/common/mptRandom.cpp Mon Mar 4 13:34:19 2024 (r20236) @@ -45,13 +45,27 @@ mpt::random_device & global_random_device() { +#if MPT_COMPILER_CLANG +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wexit-time-destructors" +#endif // MPT_COMPILER_CLANG static mpt::random_device g_rd; +#if MPT_COMPILER_CLANG +#pragma clang diagnostic pop +#endif // MPT_COMPILER_CLANG return g_rd; } mpt::thread_safe_prng<mpt::default_prng> & global_prng() { +#if MPT_COMPILER_CLANG +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wexit-time-destructors" +#endif // MPT_COMPILER_CLANG static mpt::thread_safe_prng<mpt::default_prng> g_global_prng(mpt::make_prng<mpt::default_prng>(global_random_device())); +#if MPT_COMPILER_CLANG +#pragma clang diagnostic pop +#endif // MPT_COMPILER_CLANG return g_global_prng; } |
|
From: <sv...@op...> - 2024-03-04 10:31:10
|
Author: manx Date: Mon Mar 4 11:30:58 2024 New Revision: 20235 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20235 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.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Mon Mar 4 11:30:36 2024 (r20234) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Mon Mar 4 11:30:58 2024 (r20235) @@ -5,6 +5,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.28/include/mpg123/src/libmpg123/readers.c ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c Mon Mar 4 11:30:36 2024 (r20234) +++ branches/OpenMPT-1.28/include/mpg123/src/libmpg123/readers.c Mon Mar 4 11:30:58 2024 (r20235) @@ -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; |
3 messages has been excluded from this view by a project administrator.
