modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r20086 - in branches/OpenMPT-1.28: . soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:34:52 2024
New Revision: 20086
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20086

Log:
Merged revision(s) 19872 from trunk/OpenMPT:
[Fix] Setting all load_skip flags in libopenmpt resulted in nothing being loaded at all, instead of just not loading the selected module parts (https://bugs.openmpt.org/view.php?id=1730).
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/soundlib/Sndfile.h

Modified: branches/OpenMPT-1.28/soundlib/Sndfile.h
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Sndfile.h	Wed Jan 10 21:34:33 2024	(r20085)
+++ branches/OpenMPT-1.28/soundlib/Sndfile.h	Wed Jan 10 21:34:52 2024	(r20086)
@@ -592,13 +592,13 @@
 
 	enum ModLoadingFlags
 	{
-		onlyVerifyHeader   = 0x00,
 		loadPatternData    = 0x01, // If unset, advise loaders to not process any pattern data (if possible)
 		loadSampleData     = 0x02, // If unset, advise loaders to not process any sample data (if possible)
-		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instanciated).
-		loadPluginInstance = 0x08, // If unset, plugins are not instanciated.
+		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instantiated).
+		loadPluginInstance = 0x08, // If unset, plugins are not instantiated.
 		skipContainer      = 0x10,
 		skipModules        = 0x20,
+		onlyVerifyHeader   = 0x40, // Do not combine with other flags!
 
 		// Shortcuts
 		loadCompleteModule = loadSampleData | loadPatternData | loadPluginData | loadPluginInstance,

[OMPT-svn-commit] OpenMPT r20085 - in branches/OpenMPT-1.29: . soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:34:33 2024
New Revision: 20085
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20085

Log:
Merged revision(s) 19872 from trunk/OpenMPT:
[Fix] Setting all load_skip flags in libopenmpt resulted in nothing being loaded at all, instead of just not loading the selected module parts (https://bugs.openmpt.org/view.php?id=1730).
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/soundlib/Sndfile.h

Modified: branches/OpenMPT-1.29/soundlib/Sndfile.h
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Sndfile.h	Wed Jan 10 21:34:11 2024	(r20084)
+++ branches/OpenMPT-1.29/soundlib/Sndfile.h	Wed Jan 10 21:34:33 2024	(r20085)
@@ -629,13 +629,13 @@
 
 	enum ModLoadingFlags
 	{
-		onlyVerifyHeader   = 0x00,
 		loadPatternData    = 0x01, // If unset, advise loaders to not process any pattern data (if possible)
 		loadSampleData     = 0x02, // If unset, advise loaders to not process any sample data (if possible)
-		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instanciated).
-		loadPluginInstance = 0x08, // If unset, plugins are not instanciated.
+		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instantiated).
+		loadPluginInstance = 0x08, // If unset, plugins are not instantiated.
 		skipContainer      = 0x10,
 		skipModules        = 0x20,
+		onlyVerifyHeader   = 0x40, // Do not combine with other flags!
 
 		// Shortcuts
 		loadCompleteModule = loadSampleData | loadPatternData | loadPluginData | loadPluginInstance,

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

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

Author: sagamusix
Date: Wed Jan 10 21:34:11 2024
New Revision: 20084
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20084

Log:
Merged revision(s) 19872 from trunk/OpenMPT:
[Fix] Setting all load_skip flags in libopenmpt resulted in nothing being loaded at all, instead of just not loading the selected module parts (https://bugs.openmpt.org/view.php?id=1730).
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Sndfile.h

Modified: branches/OpenMPT-1.30/soundlib/Sndfile.h
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Sndfile.h	Wed Jan 10 21:33:43 2024	(r20083)
+++ branches/OpenMPT-1.30/soundlib/Sndfile.h	Wed Jan 10 21:34:11 2024	(r20084)
@@ -682,13 +682,13 @@
 
 	enum ModLoadingFlags
 	{
-		onlyVerifyHeader   = 0x00,
 		loadPatternData    = 0x01, // If unset, advise loaders to not process any pattern data (if possible)
 		loadSampleData     = 0x02, // If unset, advise loaders to not process any sample data (if possible)
-		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instanciated).
-		loadPluginInstance = 0x08, // If unset, plugins are not instanciated.
+		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instantiated).
+		loadPluginInstance = 0x08, // If unset, plugins are not instantiated.
 		skipContainer      = 0x10,
 		skipModules        = 0x20,
+		onlyVerifyHeader   = 0x40, // Do not combine with other flags!
 
 		// Shortcuts
 		loadCompleteModule = loadSampleData | loadPatternData | loadPluginData | loadPluginInstance,

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

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

Author: sagamusix
Date: Wed Jan 10 21:33:43 2024
New Revision: 20083
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20083

Log:
Merged revision(s) 19872 from trunk/OpenMPT:
[Fix] Setting all load_skip flags in libopenmpt resulted in nothing being loaded at all, instead of just not loading the selected module parts (https://bugs.openmpt.org/view.php?id=1730).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Sndfile.h

Modified: branches/OpenMPT-1.31/soundlib/Sndfile.h
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Sndfile.h	Wed Jan 10 21:32:56 2024	(r20082)
+++ branches/OpenMPT-1.31/soundlib/Sndfile.h	Wed Jan 10 21:33:43 2024	(r20083)
@@ -699,13 +699,13 @@
 
 	enum ModLoadingFlags
 	{
-		onlyVerifyHeader   = 0x00,
 		loadPatternData    = 0x01, // If unset, advise loaders to not process any pattern data (if possible)
 		loadSampleData     = 0x02, // If unset, advise loaders to not process any sample data (if possible)
-		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instanciated).
-		loadPluginInstance = 0x08, // If unset, plugins are not instanciated.
+		loadPluginData     = 0x04, // If unset, plugin data is not loaded (and as a consequence, plugins are not instantiated).
+		loadPluginInstance = 0x08, // If unset, plugins are not instantiated.
 		skipContainer      = 0x10,
 		skipModules        = 0x20,
+		onlyVerifyHeader   = 0x40, // Do not combine with other flags!
 
 		// Shortcuts
 		loadCompleteModule = loadSampleData | loadPatternData | loadPluginData | loadPluginInstance,

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

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

Author: sagamusix
Date: Wed Jan 10 21:32:56 2024
New Revision: 20082
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20082

Log:
Merged revision(s) 19889-19890 from trunk/OpenMPT:
[Imp] SFZ: Read and write global_label (instrument name).
[Imp] SFZ: Don't set sustain point on volume envelope if it's the last point of the envelope and its value is 0.
........
[Fix] SFZ: Avoid writing labels that contain <, = and various whitespace characters, to ensure that the resulting SFZ file can be parsed unambiguously.
........

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

Modified: branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp	Wed Jan 10 21:32:10 2024	(r20081)
+++ branches/OpenMPT-1.31/soundlib/SampleFormatSFZ.cpp	Wed Jan 10 21:32:56 2024	(r20082)
@@ -168,7 +168,7 @@
 				break;
 		}
 
-		if(sustain < env.size())
+		if(sustain < env.size() && !(envType == ENV_VOLUME && sustain == env.size() - 1u && env.back().value == 0))
 		{
 			env.nSustainStart = env.nSustainEnd = sustain;
 			env.dwFlags.set(ENV_SUSTAIN);
@@ -307,7 +307,7 @@
 	};
 
 	size_t filenameOffset = 0;
-	std::string filename, name;
+	std::string filename, globalName, regionName;
 	SFZEnvelope ampEnv, pitchEnv, filterEnv;
 	std::vector<SFZFlexEG> flexEGs;
 	SmpLength loopStart = 0, loopEnd = 0;
@@ -398,8 +398,10 @@
 			filename = control.defaultPath + value;
 			filenameOffset = control.defaultPath.size();
 		}
+		else if(key == "global_label")
+			globalName = value;
 		else if(key == "region_label")
-			name = value;
+			regionName = value;
 		else if(key == "lokey")
 			keyLo = ReadKey(value, control);
 		else if(key == "hikey")
@@ -761,6 +763,7 @@
 	DestroyInstrument(nInstr, deleteAssociatedSamples);
 	if(nInstr > m_nInstruments) m_nInstruments = nInstr;
 	Instruments[nInstr] = pIns;
+	pIns->name = mpt::ToCharset(GetCharsetInternal(), mpt::Charset::UTF8, globals.globalName);
 
 	SAMPLEINDEX prevSmp = 0;
 	for(auto &region : regions)
@@ -841,8 +844,8 @@
 			sample.uFlags.set(SMP_KEEPONDISK, sample.HasSampleData());
 		}
 
-		if(!region.name.empty())
-			m_szNames[smp] = mpt::ToCharset(GetCharsetInternal(), mpt::Charset::UTF8, region.name);
+		if(!region.regionName.empty())
+			m_szNames[smp] = mpt::ToCharset(GetCharsetInternal(), mpt::Charset::UTF8, region.regionName);
 		if(!m_szNames[smp][0])
 			m_szNames[smp] = mpt::ToCharset(GetCharsetInternal(), mpt::PathString::FromUTF8(region.filename).GetFilenameBase().ToUnicode());
 
@@ -1070,6 +1073,19 @@
 		f << "\n// Release Node: " << static_cast<uint32>(env.nReleaseNode);
 }
 
+static std::string SanitizeSFZString(std::string s, mpt::Charset sourceCharset)
+{
+	using namespace std::literals;
+	// Remove characters could trip up the parser
+	std::string::size_type pos = 0;
+	while((pos = s.find_first_of("<=\r\n\t\0"sv, pos)) != std::string::npos)
+	{
+		s[pos++] = ' ';
+	}
+	return mpt::ToCharset(mpt::Charset::UTF8, sourceCharset, s);
+}
+
+
 bool CSoundFile::SaveSFZInstrument(INSTRUMENTINDEX nInstr, std::ostream &f, const mpt::PathString &filename, bool useFLACsamples) const
 {
 #ifdef MODPLUG_TRACKER
@@ -1092,10 +1108,6 @@
 	const double tickDuration = m_PlayState.m_nSamplesPerTick / static_cast<double>(m_MixerSettings.gdwMixingFreq);
 
 	f << std::setprecision(10);
-	if(!ins->name.empty())
-	{
-		f << "// Name: " << mpt::ToCharset(mpt::Charset::UTF8, GetCharsetInternal(), ins->name) << "\n";
-	}
 	f << "// Created with " << mpt::ToCharset(mpt::Charset::UTF8, Version::Current().GetOpenMPTVersionString()) << "\n";
 	f << "// Envelope tempo base: tempo " << m_PlayState.m_nMusicTempo.ToDouble();
 	switch(m_nTempoMode)
@@ -1114,8 +1126,12 @@
 		break;
 	}
 
-	f << "\n\n<control>\ndefault_path=" << sampleDirName.ToUTF8() << "\n\n";
-	f << "<group>";
+	f << "\n\n<control>\ndefault_path=" << sampleDirName.ToUTF8();
+	if(const auto globalName = SanitizeSFZString(ins->name, GetCharsetInternal()); !globalName.empty())
+	{
+		f << "\n\n<global>\nglobal_label=" << globalName;
+	}
+	f << "\n\n<group>";
 	f << "\nbend_up=" << ins->midiPWD * 100;
 	f << "\nbend_down=" << -ins->midiPWD * 100;
 	const uint32 cutoff = ins->IsCutoffEnabled() ? ins->GetCutoff() : 127;
@@ -1215,9 +1231,9 @@
 
 
 		f << "\n\n<region>";
-		if(!m_szNames[ins->Keyboard[i]].empty())
+		if(const auto regionName = SanitizeSFZString(m_szNames[ins->Keyboard[i]], GetCharsetInternal()); !regionName.empty())
 		{
-			f << "\nregion_label=" << mpt::ToCharset(mpt::Charset::UTF8, GetCharsetInternal(), m_szNames[ins->Keyboard[i]]);
+			f << "\nregion_label=" << regionName;
 		}
 		f << "\nsample=" << sampleName.GetFilename().ToUTF8();
 		f << "\nlokey=" << i;

[OMPT-svn-commit] OpenMPT r20081 - branches/OpenMPT-1.29/soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:32:10 2024
New Revision: 20081
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20081

Log:
[Fix] Fix compilation.

Modified:
   branches/OpenMPT-1.29/soundlib/Load_it.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_it.cpp	Wed Jan 10 21:28:21 2024	(r20080)
+++ branches/OpenMPT-1.29/soundlib/Load_it.cpp	Wed Jan 10 21:32:10 2024	(r20081)
@@ -1230,14 +1230,14 @@
 			if(fileHeader.cwtv < SchismVersionFromDate<2016, 05, 13>::Version())
 				m_playBehaviour.reset(kITShortSampleRetrig);
 			// 2023-10-16: kITEnvelopePositionHandling https://github.com/schismtracker/schismtracker/commit/bc81f605d927ca931a886417641da29fc89283b8
-			if(schismDateVersion < SchismVersionFromDate<2023, 10, 19>::date)
+			if(fileHeader.cwtv < SchismVersionFromDate<2023, 10, 19>::Version())
 			{
 				// Panbrello sample & hold random waveform: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/411ec16b190ba1a486d8b0907ad8d74f8fdc2840
 				m_playBehaviour.reset(kITPanbrelloHold);
 				// Don't apply any portamento if no previous note is playing: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/8ff0a86a715efb50c89770fb9095d4c4089ff187
 				m_playBehaviour.reset(kITPortaNoNote);
 			}
-			if(schismDateVersion < SchismVersionFromDate<2023, 10, 22>::date)
+			if(fileHeader.cwtv < SchismVersionFromDate<2023, 10, 22>::Version())
 			{
 				// Note delay delays first-tick behaviour for slides: Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/b9609e4f827e1b6ce9ebe6573b85e69388ca0ea0
 				m_playBehaviour.reset(kITFirstTickHandling);

[OMPT-svn-commit] OpenMPT r20080 - branches/OpenMPT-1.29/soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:28:21 2024
New Revision: 20080
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20080

Log:
[Fix] Partially undo some changes from r20076 to fix compilation.

Modified:
   branches/OpenMPT-1.29/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_okt.cpp	Wed Jan 10 21:27:45 2024	(r20079)
+++ branches/OpenMPT-1.29/soundlib/Load_okt.cpp	Wed Jan 10 21:28:21 2024	(r20080)
@@ -119,8 +119,6 @@
 		for(CHANNELINDEX chn = 0; chn < chns; chn++)
 		{
 			ModCommand &m = rowCmd[chn];
-			const auto oldCmd = m.command;
-			const auto oldParam = m.param;
 			const auto [note, instr, effect, param] = chunk.ReadArray<uint8, 4>();
 			m.param = param;
 
@@ -266,12 +264,6 @@
 				m.param = 0;
 				break;
 			}
-
-			// In case we overwrote the volume command from a mixed channel
-			if(oldCmd != CMD_NONE && m.command != oldCmd)
-			{
-				m.FillInTwoCommands(m.command, m.param, oldCmd, oldParam);
-			}
 		}
 	}
 }

[OMPT-svn-commit] OpenMPT r20079 - branches/OpenMPT-1.30/soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:27:45 2024
New Revision: 20079
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20079

Log:
[Fix] Partially undo some changes from r20075 to fix compilation.

Modified:
   branches/OpenMPT-1.30/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.30/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_okt.cpp	Wed Jan 10 21:21:33 2024	(r20078)
+++ branches/OpenMPT-1.30/soundlib/Load_okt.cpp	Wed Jan 10 21:27:45 2024	(r20079)
@@ -117,8 +117,6 @@
 		for(CHANNELINDEX chn = 0; chn < chns; chn++)
 		{
 			ModCommand &m = rowCmd[chn];
-			const auto oldCmd = m.command;
-			const auto oldParam = m.param;
 			const auto [note, instr, effect, param] = chunk.ReadArray<uint8, 4>();
 
 			if(note > 0 && note <= 36)
@@ -309,12 +307,6 @@
 			default:
 				break;
 			}
-
-			// In case we overwrote the volume command from a mixed channel
-			if(oldCmd != CMD_NONE && m.command != oldCmd)
-			{
-				m.FillInTwoCommands(m.command, m.param, oldCmd, oldParam);
-			}
 		}
 	}
 }

[OMPT-svn-commit] OpenMPT r20078 - in branches/OpenMPT-1.28: . soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:21:33 2024
New Revision: 20078
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20078

Log:
Merged revision(s) 19871 from trunk/OpenMPT:
[Imp] IT: Set/unset a few more compatibility flags for recently-implemented playback fixes in SchismTracker.
........

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

Modified: branches/OpenMPT-1.28/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Load_it.cpp	Wed Jan 10 21:20:34 2024	(r20077)
+++ branches/OpenMPT-1.28/soundlib/Load_it.cpp	Wed Jan 10 21:21:33 2024	(r20078)
@@ -1214,6 +1214,21 @@
 			// Qxx with short samples: Added 2016-05-13, https://github.com/schismtracker/schismtracker/commit/e7b1461fe751554309fd403713c2a1ef322105ca
 			if(fileHeader.cwtv < SchismVersionFromDate<2016, 05, 13>::Version())
 				m_playBehaviour.reset(kITShortSampleRetrig);
+			// 2023-10-16: kITEnvelopePositionHandling https://github.com/schismtracker/schismtracker/commit/bc81f605d927ca931a886417641da29fc89283b8
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 19>::date)
+			{
+				// Panbrello sample & hold random waveform: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/411ec16b190ba1a486d8b0907ad8d74f8fdc2840
+				m_playBehaviour.reset(kITPanbrelloHold);
+				// Don't apply any portamento if no previous note is playing: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/8ff0a86a715efb50c89770fb9095d4c4089ff187
+				m_playBehaviour.reset(kITPortaNoNote);
+			}
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 22>::date)
+			{
+				// Note delay delays first-tick behaviour for slides: Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/b9609e4f827e1b6ce9ebe6573b85e69388ca0ea0
+				m_playBehaviour.reset(kITFirstTickHandling);
+				// Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/a9e5df533ab52c35190fcc1cbfed4f0347b660bb
+				m_playBehaviour.reset(kITMultiSampleInstrumentNumber);
+			}
 			break;
 		case 4:
 			madeWithTracker = mpt::format(U_("pyIT %1.%2"))((fileHeader.cwtv & 0x0F00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF));

[OMPT-svn-commit] OpenMPT r20077 - in branches/OpenMPT-1.29: . soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:20:34 2024
New Revision: 20077
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20077

Log:
Merged revision(s) 19871 from trunk/OpenMPT:
[Imp] IT: Set/unset a few more compatibility flags for recently-implemented playback fixes in SchismTracker.
........

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

Modified: branches/OpenMPT-1.29/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_it.cpp	Wed Jan 10 21:20:06 2024	(r20076)
+++ branches/OpenMPT-1.29/soundlib/Load_it.cpp	Wed Jan 10 21:20:34 2024	(r20077)
@@ -1229,6 +1229,21 @@
 			// Qxx with short samples: Added 2016-05-13, https://github.com/schismtracker/schismtracker/commit/e7b1461fe751554309fd403713c2a1ef322105ca
 			if(fileHeader.cwtv < SchismVersionFromDate<2016, 05, 13>::Version())
 				m_playBehaviour.reset(kITShortSampleRetrig);
+			// 2023-10-16: kITEnvelopePositionHandling https://github.com/schismtracker/schismtracker/commit/bc81f605d927ca931a886417641da29fc89283b8
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 19>::date)
+			{
+				// Panbrello sample & hold random waveform: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/411ec16b190ba1a486d8b0907ad8d74f8fdc2840
+				m_playBehaviour.reset(kITPanbrelloHold);
+				// Don't apply any portamento if no previous note is playing: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/8ff0a86a715efb50c89770fb9095d4c4089ff187
+				m_playBehaviour.reset(kITPortaNoNote);
+			}
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 22>::date)
+			{
+				// Note delay delays first-tick behaviour for slides: Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/b9609e4f827e1b6ce9ebe6573b85e69388ca0ea0
+				m_playBehaviour.reset(kITFirstTickHandling);
+				// Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/a9e5df533ab52c35190fcc1cbfed4f0347b660bb
+				m_playBehaviour.reset(kITMultiSampleInstrumentNumber);
+			}
 			break;
 		case 4:
 			madeWithTracker = mpt::format(U_("pyIT %1.%2"))((fileHeader.cwtv & 0x0F00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF));

[OMPT-svn-commit] OpenMPT r20076 - in branches/OpenMPT-1.29: . soundlib

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

Author: sagamusix
Date: Wed Jan 10 21:20:06 2024
New Revision: 20076
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20076

Log:
Merged revision(s) 19869 from trunk/OpenMPT:
[Imp] OKT: Work around missing negative arpeggio implementation by transposing the notes up an octave (https://bugs.openmpt.org/view.php?id=1732).
[Fix] OKT: Setting channel volume should take precedence over other effects. Another fix for https://bugs.openmpt.org/view.php?id=1732
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/soundlib/Load_okt.cpp

Modified: branches/OpenMPT-1.29/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.29/soundlib/Load_okt.cpp	Wed Jan 10 21:18:30 2024	(r20075)
+++ branches/OpenMPT-1.29/soundlib/Load_okt.cpp	Wed Jan 10 21:20:06 2024	(r20076)
@@ -81,6 +81,19 @@
 }
 
 
+// Turn negative arpeggio offset into equivalent positive arpeggio offset
+static uint8 InvertArpeggioParam(uint8 param)
+{
+	param &= 0x0F;
+	if(!param)
+		return param;
+	else if(param <= 0x0C)
+		return (0x0C - param);
+	else
+		return (0x18 - param);
+}
+
+
 // Parse a pattern block
 static void ReadOKTPattern(FileReader &chunk, PATTERNINDEX pat, CSoundFile &sndFile)
 {
@@ -106,6 +119,8 @@
 		for(CHANNELINDEX chn = 0; chn < chns; chn++)
 		{
 			ModCommand &m = rowCmd[chn];
+			const auto oldCmd = m.command;
+			const auto oldParam = m.param;
 			const auto [note, instr, effect, param] = chunk.ReadArray<uint8, 4>();
 			m.param = param;
 
@@ -133,15 +148,22 @@
 				m.param &= 0x0F;
 				break;
 
-#if 0
-			/* these aren't like Jxx: "down" means to *subtract* the offset from the note.
-			For now I'm going to leave these unimplemented. */
-			case 10: // A Arpeggio 1 (down, orig, up)
-			case 11: // B Arpeggio 2 (orig, up, orig, down)
-				if (m.param)
+			case 10:  // A Arpeggio 1 (down, orig, up)
+				if(param)
+				{
 					m.command = CMD_ARPEGGIO;
+					m.param = (param & 0x0F) | (InvertArpeggioParam(param >> 4) << 4);
+				}
 				break;
-#endif
+
+			case 11:  // B Arpeggio 2 (orig, up, orig, down)
+				if(param)
+				{
+					m.command = CMD_ARPEGGIO;
+					m.param = (param & 0xF0) | InvertArpeggioParam(param & 0x0F);
+				}
+				break;
+
 			// This one is close enough to "standard" arpeggio -- I think!
 			case 12: // C Arpeggio 3 (up, up, orig)
 				if (m.param)
@@ -241,10 +263,15 @@
 #endif
 
 			default:
-				m.command = CMD_NONE;
 				m.param = 0;
 				break;
 			}
+
+			// In case we overwrote the volume command from a mixed channel
+			if(oldCmd != CMD_NONE && m.command != oldCmd)
+			{
+				m.FillInTwoCommands(m.command, m.param, oldCmd, oldParam);
+			}
 		}
 	}
 }

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

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

Author: sagamusix
Date: Wed Jan 10 21:18:30 2024
New Revision: 20075
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20075

Log:
Merged revision(s) 19869, 19871 from trunk/OpenMPT:
[Imp] OKT: Work around missing negative arpeggio implementation by transposing the notes up an octave (https://bugs.openmpt.org/view.php?id=1732).
[Fix] OKT: Setting channel volume should take precedence over other effects. Another fix for https://bugs.openmpt.org/view.php?id=1732
........
[Imp] IT: Set/unset a few more compatibility flags for recently-implemented playback fixes in SchismTracker.
........

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

Modified: branches/OpenMPT-1.30/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_it.cpp	Wed Jan 10 21:17:58 2024	(r20074)
+++ branches/OpenMPT-1.30/soundlib/Load_it.cpp	Wed Jan 10 21:18:30 2024	(r20075)
@@ -1241,6 +1241,21 @@
 			// Pitch/Pan Separation can be overridden by panning commands: Added 2021-11-01, https://github.com/schismtracker/schismtracker/commit/6e9f1207015cae0fe1b829fff7bb867e02ec6dea
 			if(schismDateVersion < SchismVersionFromDate<2021, 11, 01>::date)
 				m_playBehaviour.reset(kITPitchPanSeparation);
+			// 2023-10-16: kITEnvelopePositionHandling https://github.com/schismtracker/schismtracker/commit/bc81f605d927ca931a886417641da29fc89283b8
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 19>::date)
+			{
+				// Panbrello sample & hold random waveform: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/411ec16b190ba1a486d8b0907ad8d74f8fdc2840
+				m_playBehaviour.reset(kITPanbrelloHold);
+				// Don't apply any portamento if no previous note is playing: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/8ff0a86a715efb50c89770fb9095d4c4089ff187
+				m_playBehaviour.reset(kITPortaNoNote);
+			}
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 22>::date)
+			{
+				// Note delay delays first-tick behaviour for slides: Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/b9609e4f827e1b6ce9ebe6573b85e69388ca0ea0
+				m_playBehaviour.reset(kITFirstTickHandling);
+				// Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/a9e5df533ab52c35190fcc1cbfed4f0347b660bb
+				m_playBehaviour.reset(kITMultiSampleInstrumentNumber);
+			}
 			break;
 		case 4:
 			madeWithTracker = MPT_UFORMAT("pyIT {}.{}")((fileHeader.cwtv & 0x0F00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF));

Modified: branches/OpenMPT-1.30/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_okt.cpp	Wed Jan 10 21:17:58 2024	(r20074)
+++ branches/OpenMPT-1.30/soundlib/Load_okt.cpp	Wed Jan 10 21:18:30 2024	(r20075)
@@ -79,6 +79,19 @@
 }
 
 
+// Turn negative arpeggio offset into equivalent positive arpeggio offset
+static uint8 InvertArpeggioParam(uint8 param)
+{
+	param &= 0x0F;
+	if(!param)
+		return param;
+	else if(param <= 0x0C)
+		return (0x0C - param);
+	else
+		return (0x18 - param);
+}
+
+
 // Parse a pattern block
 static void ReadOKTPattern(FileReader &chunk, PATTERNINDEX pat, CSoundFile &sndFile, const std::array<int8, 8> pairedChn)
 {
@@ -104,6 +117,8 @@
 		for(CHANNELINDEX chn = 0; chn < chns; chn++)
 		{
 			ModCommand &m = rowCmd[chn];
+			const auto oldCmd = m.command;
+			const auto oldParam = m.param;
 			const auto [note, instr, effect, param] = chunk.ReadArray<uint8, 4>();
 
 			if(note > 0 && note <= 36)
@@ -147,18 +162,22 @@
 				}
 				break;
 
-#if 0
-			/* these aren't like regular arpeggio: "down" means to *subtract* the offset from the note.
-			For now I'm going to leave these unimplemented. */
 			case 10:  // A Arpeggio 1 (down, orig, up)
+				if(param)
+				{
+					m.command = CMD_ARPEGGIO;
+					m.param = (param & 0x0F) | (InvertArpeggioParam(param >> 4) << 4);
+				}
+				break;
+
 			case 11:  // B Arpeggio 2 (orig, up, orig, down)
 				if(param)
 				{
 					m.command = CMD_ARPEGGIO;
-					m.param = param;
+					m.param = (param & 0xF0) | InvertArpeggioParam(param & 0x0F);
 				}
 				break;
-#endif
+		
 			// This one is close enough to "standard" arpeggio -- I think!
 			case 12:  // C Arpeggio 3 (up, up, orig)
 				if(param)
@@ -288,9 +307,14 @@
 #endif
 
 			default:
-				m.command = CMD_NONE;
 				break;
 			}
+
+			// In case we overwrote the volume command from a mixed channel
+			if(oldCmd != CMD_NONE && m.command != oldCmd)
+			{
+				m.FillInTwoCommands(m.command, m.param, oldCmd, oldParam);
+			}
 		}
 	}
 }

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

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

Author: sagamusix
Date: Wed Jan 10 21:17:58 2024
New Revision: 20074
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20074

Log:
Merged revision(s) 19869, 19871 from trunk/OpenMPT:
[Imp] OKT: Work around missing negative arpeggio implementation by transposing the notes up an octave (https://bugs.openmpt.org/view.php?id=1732).
[Fix] OKT: Setting channel volume should take precedence over other effects. Another fix for https://bugs.openmpt.org/view.php?id=1732
........
[Imp] IT: Set/unset a few more compatibility flags for recently-implemented playback fixes in SchismTracker.
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_it.cpp	Wed Jan 10 21:16:57 2024	(r20073)
+++ branches/OpenMPT-1.31/soundlib/Load_it.cpp	Wed Jan 10 21:17:58 2024	(r20074)
@@ -1291,6 +1291,21 @@
 			// Initial note memory for channel is C-0: Added 2023-03-09, https://github.com/schismtracker/schismtracker/commit/73e9d60676c2b48c8e94e582373e29517105b2b1
 			if(schismDateVersion < SchismVersionFromDate<2023, 03, 9>::date)
 				m_playBehaviour.reset(kITInitialNoteMemory);
+			// 2023-10-16: kITEnvelopePositionHandling https://github.com/schismtracker/schismtracker/commit/bc81f605d927ca931a886417641da29fc89283b8
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 19>::date)
+			{
+				// Panbrello sample & hold random waveform: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/411ec16b190ba1a486d8b0907ad8d74f8fdc2840
+				m_playBehaviour.reset(kITPanbrelloHold);
+				// Don't apply any portamento if no previous note is playing: Added 2023-10-19, https://github.com/schismtracker/schismtracker/commit/8ff0a86a715efb50c89770fb9095d4c4089ff187
+				m_playBehaviour.reset(kITPortaNoNote);
+			}
+			if(schismDateVersion < SchismVersionFromDate<2023, 10, 22>::date)
+			{
+				// Note delay delays first-tick behaviour for slides: Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/b9609e4f827e1b6ce9ebe6573b85e69388ca0ea0
+				m_playBehaviour.reset(kITFirstTickHandling);
+				// Added 2023-10-22, https://github.com/schismtracker/schismtracker/commit/a9e5df533ab52c35190fcc1cbfed4f0347b660bb
+				m_playBehaviour.reset(kITMultiSampleInstrumentNumber);
+			}
 			break;
 		case 4:
 			madeWithTracker = MPT_UFORMAT("pyIT {}.{}")((fileHeader.cwtv & 0x0F00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF));

Modified: branches/OpenMPT-1.31/soundlib/Load_okt.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_okt.cpp	Wed Jan 10 21:16:57 2024	(r20073)
+++ branches/OpenMPT-1.31/soundlib/Load_okt.cpp	Wed Jan 10 21:17:58 2024	(r20074)
@@ -79,6 +79,19 @@
 }
 
 
+// Turn negative arpeggio offset into equivalent positive arpeggio offset
+static uint8 InvertArpeggioParam(uint8 param)
+{
+	param &= 0x0F;
+	if(!param)
+		return param;
+	else if(param <= 0x0C)
+		return (0x0C - param);
+	else
+		return (0x18 - param);
+}
+
+
 // Parse a pattern block
 static void ReadOKTPattern(FileReader &chunk, PATTERNINDEX pat, CSoundFile &sndFile, const std::array<int8, 8> pairedChn)
 {
@@ -104,6 +117,8 @@
 		for(CHANNELINDEX chn = 0; chn < chns; chn++)
 		{
 			ModCommand &m = rowCmd[chn];
+			const auto oldCmd = m.command;
+			const auto oldParam = m.param;
 			const auto [note, instr, effect, param] = chunk.ReadArray<uint8, 4>();
 
 			if(note > 0 && note <= 36)
@@ -147,18 +162,22 @@
 				}
 				break;
 
-#if 0
-			/* these aren't like regular arpeggio: "down" means to *subtract* the offset from the note.
-			For now I'm going to leave these unimplemented. */
 			case 10:  // A Arpeggio 1 (down, orig, up)
+				if(param)
+				{
+					m.command = CMD_ARPEGGIO;
+					m.param = (param & 0x0F) | (InvertArpeggioParam(param >> 4) << 4);
+				}
+				break;
+
 			case 11:  // B Arpeggio 2 (orig, up, orig, down)
 				if(param)
 				{
 					m.command = CMD_ARPEGGIO;
-					m.param = param;
+					m.param = (param & 0xF0) | InvertArpeggioParam(param & 0x0F);
 				}
 				break;
-#endif
+		
 			// This one is close enough to "standard" arpeggio -- I think!
 			case 12:  // C Arpeggio 3 (up, up, orig)
 				if(param)
@@ -286,9 +305,14 @@
 #endif
 
 			default:
-				m.command = CMD_NONE;
 				break;
 			}
+
+			// In case we overwrote the volume command from a mixed channel
+			if(oldCmd != CMD_NONE && m.command != oldCmd)
+			{
+				m.FillInTwoCommands(m.command, m.param, oldCmd, oldParam);
+			}
 		}
 	}
 }

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

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

Author: sagamusix
Date: Wed Jan 10 21:16:57 2024
New Revision: 20073
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20073

Log:
Merged revision(s) 19868, 19870, 19874, 19885 from trunk/OpenMPT:
[Fix] Sample tab: Fix transposition after manually entering sample rate.
........
[Fix] Instrument tab: Clearing the note map due to plugin assignment didn't update other instrument tabs of the same song accordingly.
[Fix] Pattern tab: Assigning / unassigning a plugin to / from an instrument didn't update their plugin editor button in the pattern tab.
........
[Imp] Tree view: Speed up checking if there are any plugins in a module.
........
[Fix] Instrument tab: Actually update plugin list if there is a plugin list update hint.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/Ctrl_ins.cpp
   branches/OpenMPT-1.31/mptrack/Ctrl_pat.cpp
   branches/OpenMPT-1.31/mptrack/Ctrl_smp.cpp
   branches/OpenMPT-1.31/mptrack/View_tre.cpp

Modified: branches/OpenMPT-1.31/mptrack/Ctrl_ins.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Ctrl_ins.cpp	Wed Jan 10 21:13:57 2024	(r20072)
+++ branches/OpenMPT-1.31/mptrack/Ctrl_ins.cpp	Wed Jan 10 21:16:57 2024	(r20073)
@@ -1299,9 +1299,9 @@
 		hint.ModType(); // For possibly updating note names in Pitch/Pan Separation dropdown
 	}
 	LockControls();
-	if(hint.ToType<PluginHint>().GetType()[HINT_MIXPLUGINS | HINT_PLUGINNAMES])
+	if(hint.ToType<PluginHint>().GetType()[HINT_PLUGINNAMES])
 	{
-		OnMixPlugChanged();
+		UpdatePluginList();
 	}
 	if(hint.ToType<GeneralHint>().GetType()[HINT_TUNINGS])
 	{
@@ -2551,6 +2551,7 @@
 						{
 							pIns->AssignSample(0);
 							m_NoteMap.Invalidate();
+							UpdateView(InstrumentHint(m_nInstrument).Info());
 						}
 					}
 					return;

Modified: branches/OpenMPT-1.31/mptrack/Ctrl_pat.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Ctrl_pat.cpp	Wed Jan 10 21:13:57 2024	(r20072)
+++ branches/OpenMPT-1.31/mptrack/Ctrl_pat.cpp	Wed Jan 10 21:16:57 2024	(r20073)
@@ -244,7 +244,7 @@
 		GetDlgItem(IDC_SPIN_SEQNUM)->EnableWindow(isMultiSeqAvail);
 	}
 
-	if(updateAll || updatePlug)
+	if(updateAll || updatePlug || (hint.GetCategory() == HINTCAT_INSTRUMENTS && hintType[HINT_INSTRUMENT]))
 	{
 		GetDlgItem(IDC_PATINSTROPLUGGUI)->EnableWindow(HasValidPlug(m_nInstrument) ? TRUE : FALSE);
 	}

Modified: branches/OpenMPT-1.31/mptrack/Ctrl_smp.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Ctrl_smp.cpp	Wed Jan 10 21:13:57 2024	(r20072)
+++ branches/OpenMPT-1.31/mptrack/Ctrl_smp.cpp	Wed Jan 10 21:16:57 2024	(r20073)
@@ -2685,7 +2685,7 @@
 		if ((n > 0) && (n <= (m_sndFile.GetType() == MOD_TYPE_S3M ? 65535 : 9999999)) && (n != (int)m_sndFile.GetSample(m_nSample).nC5Speed))
 		{
 			sample.nC5Speed = n;
-			int transp = ModSample::FrequencyToTranspose(n).first;
+			int transp = GetSampleTransponse(sample);
 			int basenote = (NOTE_MIDDLEC - NOTE_MIN) + transp;
 			Clamp(basenote, BASENOTE_MIN, BASENOTE_MAX);
 			basenote -= BASENOTE_MIN;

Modified: branches/OpenMPT-1.31/mptrack/View_tre.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_tre.cpp	Wed Jan 10 21:13:57 2024	(r20072)
+++ branches/OpenMPT-1.31/mptrack/View_tre.cpp	Wed Jan 10 21:16:57 2024	(r20073)
@@ -815,7 +815,6 @@
 				hItem = GetNextSiblingItem(hItem);
 			}
 		}
-		bool hasPlugs = false;
 		for(PLUGINDEX i = firstPlug; i <= lastPlug; i++)
 		{
 			const SNDMIXPLUGIN &plugin = sndFile.m_MixPlugins[i];
@@ -849,22 +848,9 @@
 				{
 					InsertItem(TVIF_TEXT | TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM, s, nImage, nImage, 0, 0, i, info.hEffects, TVI_LAST);
 				}
-				hasPlugs = true;
 			}
 		}
-		if(!hasPlugs && firstPlug == lastPlug)
-		{
-			// If we only updated one plugin, we still need to check all the other slots if there is any plugin in them.
-			for(const auto &plug : sndFile.m_MixPlugins)
-			{
-				if(plug.IsValidPlugin())
-				{
-					hasPlugs = true;
-					break;
-				}
-			}
-		}
-		if(!hasPlugs && info.hEffects)
+		if(!sndFile.m_loadedPlugins && info.hEffects)
 		{
 			DeleteItem(info.hEffects);
 			info.hEffects = nullptr;

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

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

Author: sagamusix
Date: Wed Jan 10 21:13:57 2024
New Revision: 20072
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20072

Log:
Merged revision(s) 20068 from trunk/OpenMPT:
[Fix] libopenmpt: When playing all subsongs, set_position_seconds didn't always calculate the correct subsong to jump to (https://bugs.openmpt.org/view.php?id=1740).
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/libopenmpt/libopenmpt_impl.cpp

Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_impl.cpp
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:13:40 2024	(r20071)
+++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:13:57 2024	(r20072)
@@ -1072,7 +1072,7 @@
 				subsong = &subsongs[i];
 				break;
 			}
-			base_seconds += subsong->duration;
+			base_seconds += subsongs[i].duration;
 		}
 		seconds -= base_seconds;
 	} else {

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

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

Author: sagamusix
Date: Wed Jan 10 21:13:40 2024
New Revision: 20071
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20071

Log:
Merged revision(s) 20068 from trunk/OpenMPT:
[Fix] libopenmpt: When playing all subsongs, set_position_seconds didn't always calculate the correct subsong to jump to (https://bugs.openmpt.org/view.php?id=1740).
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/libopenmpt/   (props changed)
   branches/OpenMPT-1.29/libopenmpt/libopenmpt_impl.cpp

Modified: branches/OpenMPT-1.29/libopenmpt/libopenmpt_impl.cpp
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:13:14 2024	(r20070)
+++ branches/OpenMPT-1.29/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:13:40 2024	(r20071)
@@ -1104,7 +1104,7 @@
 				subsong = &subsongs[i];
 				break;
 			}
-			base_seconds += subsong->duration;
+			base_seconds += subsongs[i].duration;
 		}
 		seconds -= base_seconds;
 	} else {

[OMPT-svn-commit] OpenMPT r20070 - in branches/OpenMPT-1.30: . libopenmpt

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

Author: sagamusix
Date: Wed Jan 10 21:13:14 2024
New Revision: 20070
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20070

Log:
Merged revision(s) 20068 from trunk/OpenMPT:
[Fix] libopenmpt: When playing all subsongs, set_position_seconds didn't always calculate the correct subsong to jump to (https://bugs.openmpt.org/view.php?id=1740).
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/libopenmpt/   (props changed)
   branches/OpenMPT-1.30/libopenmpt/libopenmpt_impl.cpp

Modified: branches/OpenMPT-1.30/libopenmpt/libopenmpt_impl.cpp
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:12:23 2024	(r20069)
+++ branches/OpenMPT-1.30/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:13:14 2024	(r20070)
@@ -1133,7 +1133,7 @@
 				subsong = &subsongs[i];
 				break;
 			}
-			base_seconds += subsong->duration;
+			base_seconds += subsongs[i].duration;
 		}
 		seconds -= base_seconds;
 	} else {

[OMPT-svn-commit] OpenMPT r20069 - in branches/OpenMPT-1.31: . libopenmpt

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

Author: sagamusix
Date: Wed Jan 10 21:12:23 2024
New Revision: 20069
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20069

Log:
Merged revision(s) 20068 from trunk/OpenMPT:
[Fix] libopenmpt: When playing all subsongs, set_position_seconds didn't always calculate the correct subsong to jump to (https://bugs.openmpt.org/view.php?id=1740).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/libopenmpt/libopenmpt_impl.cpp

Modified: branches/OpenMPT-1.31/libopenmpt/libopenmpt_impl.cpp
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 18:59:07 2024	(r20068)
+++ branches/OpenMPT-1.31/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 21:12:23 2024	(r20069)
@@ -1115,7 +1115,7 @@
 				subsong = &subsongs[i];
 				break;
 			}
-			base_seconds += subsong->duration;
+			base_seconds += subsongs[i].duration;
 		}
 		seconds -= base_seconds;
 	} else {

[OMPT-svn-commit] OpenMPT r20068 - trunk/OpenMPT/libopenmpt

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

Author: sagamusix
Date: Wed Jan 10 18:59:07 2024
New Revision: 20068
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20068

Log:
[Fix] libopenmpt: When playing all subsongs, set_position_seconds didn't always calculate the correct subsong to jump to (https://bugs.openmpt.org/view.php?id=1740).

Modified:
   trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
==============================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 17:33:05 2024	(r20067)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	Wed Jan 10 18:59:07 2024	(r20068)
@@ -1115,7 +1115,7 @@
 				subsong = &subsongs[i];
 				break;
 			}
-			base_seconds += subsong->duration;
+			base_seconds += subsongs[i].duration;
 		}
 		seconds -= base_seconds;
 	} else {

[OMPT-svn-commit] OpenMPT r20066 - branches/OpenMPT-1.29/libopenmpt/dox

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

Author: manx
Date: Wed Jan 10 17:32:56 2024
New Revision: 20066
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20066

Log:
[Doc] libopenmpt: Update changelog.

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

Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Wed Jan 10 17:32:49 2024	(r20065)
+++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md	Wed Jan 10 17:32:56 2024	(r20066)
@@ -7,7 +7,7 @@
 
 ### libopenmpt 0.5.27-pre
 
- *  mpg123: Update to v1.32.4 (2024-01-08).
+ *  mpg123: Update to v1.32.4 (2024-01-10).
  *  pugixml: Update to v1.14 (2023-10-01).
 
 ### libopenmpt 0.5.26 (2023-09-09)

[OMPT-svn-commit] OpenMPT r20067 - branches/OpenMPT-1.28/libopenmpt/dox

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

Author: manx
Date: Wed Jan 10 17:33:05 2024
New Revision: 20067
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20067

Log:
[Doc] libopenmpt: Update changelog.

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

Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Wed Jan 10 17:32:56 2024	(r20066)
+++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md	Wed Jan 10 17:33:05 2024	(r20067)
@@ -7,7 +7,7 @@
 
 ### libopenmpt 0.4.39-pre
 
- *  mpg123: Update to v1.32.4 (2024-01-08).
+ *  mpg123: Update to v1.32.4 (2024-01-10).
 
 ### libopenmpt 0.4.38 (2023-09-09)
 

[OMPT-svn-commit] OpenMPT r20065 - branches/OpenMPT-1.30/libopenmpt/dox

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

Author: manx
Date: Wed Jan 10 17:32:49 2024
New Revision: 20065
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20065

Log:
[Doc] libopenmpt: Update changelog.

Modified:
   branches/OpenMPT-1.30/libopenmpt/dox/changelog.md

Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md
==============================================================================
--- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Wed Jan 10 17:32:41 2024	(r20064)
+++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md	Wed Jan 10 17:32:49 2024	(r20065)
@@ -7,7 +7,7 @@
 
 ### libopenmpt 0.6.13-pre
 
- *  mpg123: Update to v1.32.4 (2024-01-08).
+ *  mpg123: Update to v1.32.4 (2024-01-10).
  *  pugixml: Update to v1.14 (2023-10-01).
 
 ### libopenmpt 0.6.12 (2023-09-09)

[OMPT-svn-commit] OpenMPT r20064 - branches/OpenMPT-1.31/doc/libopenmpt

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

Author: manx
Date: Wed Jan 10 17:32:41 2024
New Revision: 20064
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20064

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 Jan  9 13:16:40 2024	(r20063)
+++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md	Wed Jan 10 17:32:41 2024	(r20064)
@@ -13,7 +13,7 @@
  *  openmpt123: openmpt123 now uses a narrower layout on terminal windows with a
     width of less than 72 characters.
 
- *  mpg123: Update to v1.32.4 (2024-01-08).
+ *  mpg123: Update to v1.32.4 (2024-01-10).
  *  pugixml: Update to v1.14 (2023-10-01).
 
 ### libopenmpt 0.7.3 (2023-09-09)

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

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

Author: manx
Date: Tue Jan  9 13:16:40 2024
New Revision: 20063
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20063

Log:
[Var] Update .gitignore.

Modified:
   trunk/OpenMPT/.gitignore

Modified: trunk/OpenMPT/.gitignore
==============================================================================
--- trunk/OpenMPT/.gitignore	Tue Jan  9 09:49:03 2024	(r20062)
+++ trunk/OpenMPT/.gitignore	Tue Jan  9 13:16:40 2024	(r20063)
@@ -447,6 +447,7 @@
 /include/mpg123/src/win32_net.c
 /include/mpg123/src/win32_support.c
 /include/mpg123/src/win32_support.h
+/include/mpg123/src/common/Makemodule.am
 /include/mpg123/src/compat/*.d
 /include/mpg123/src/compat/*.o
 /include/mpg123/src/compat/Makemodule.am

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

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

Author: manx
Date: Tue Jan  9 09:49:03 2024
New Revision: 20062
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20062

Log:
[Var] Update .gitignore.

Modified:
   branches/OpenMPT-1.28/.gitignore

Modified: branches/OpenMPT-1.28/.gitignore
==============================================================================
--- branches/OpenMPT-1.28/.gitignore	Tue Jan  9 09:48:47 2024	(r20061)
+++ branches/OpenMPT-1.28/.gitignore	Tue Jan  9 09:49:03 2024	(r20062)
@@ -354,6 +354,7 @@
 /include/mpg123/mpg123.spec
 /include/mpg123/mpg123.spec.in
 /include/mpg123/scripts
+/include/mpg123/test_c99.c
 /include/mpg123/windows-builds.sh
 /include/mpg123/ports/README
 /include/mpg123/ports/Sony_PSP
@@ -417,6 +418,7 @@
 /include/mpg123/src/win32_net.c
 /include/mpg123/src/win32_support.c
 /include/mpg123/src/win32_support.h
+/include/mpg123/src/common/Makemodule.am
 /include/mpg123/src/compat/Makemodule.am
 /include/mpg123/src/compat/compat_dl.c
 /include/mpg123/src/libmpg123/Makemodule.am