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

A music tracker software for Windows.

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

modplug-svn-commit — OpenMPT subversion commit notifications

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 82 83 84 85 86 .. 957 > >> (Page 84 of 957)

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

From: <sv...@op...> - 2024-10-14 21:50:24

Author: sagamusix
Date: Mon Oct 14 23:50:13 2024
New Revision: 21818
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21818

Log:
[Ref] Remove unnecessary ChannelManagerDlg.h includes.

Modified:
   trunk/OpenMPT/mptrack/Draw_pat.cpp
   trunk/OpenMPT/mptrack/View_gen.cpp
   trunk/OpenMPT/mptrack/View_ins.cpp
   trunk/OpenMPT/mptrack/View_smp.cpp
   trunk/OpenMPT/mptrack/view_com.cpp

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	Mon Oct 14 22:05:10 2024	(r21817)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	Mon Oct 14 23:50:13 2024	(r21818)
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "View_pat.h"
-#include "ChannelManagerDlg.h"
 #include "dlg_misc.h"
 #include "EffectVis.h"
 #include "Globals.h"

Modified: trunk/OpenMPT/mptrack/View_gen.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp	Mon Oct 14 22:05:10 2024	(r21817)
+++ trunk/OpenMPT/mptrack/View_gen.cpp	Mon Oct 14 23:50:13 2024	(r21818)
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "View_gen.h"
 #include "AbstractVstEditor.h"
-#include "ChannelManagerDlg.h"
 #include "Childfrm.h"
 #include "Ctrl_gen.h"
 #include "EffectVis.h"

Modified: trunk/OpenMPT/mptrack/View_ins.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp	Mon Oct 14 22:05:10 2024	(r21817)
+++ trunk/OpenMPT/mptrack/View_ins.cpp	Mon Oct 14 23:50:13 2024	(r21818)
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "View_ins.h"
-#include "ChannelManagerDlg.h"
 #include "Childfrm.h"
 #include "Ctrl_ins.h"
 #include "Dlsbank.h"
@@ -25,6 +24,7 @@
 #include "Reporting.h"
 #include "resource.h"
 #include "ScaleEnvPointsDlg.h"
+#include "TrackerSettings.h"
 #include "WindowMessages.h"
 #include "../common/mptStringBuffer.h"
 #include "../soundlib/MIDIEvents.h"

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	Mon Oct 14 22:05:10 2024	(r21817)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	Mon Oct 14 23:50:13 2024	(r21818)
@@ -11,10 +11,10 @@
 
 #include "stdafx.h"
 #include "View_smp.h"
-#include "ChannelManagerDlg.h"
 #include "Childfrm.h"
 #include "Clipboard.h"
 #include "Ctrl_smp.h"
+#include "dlg_misc.h"  // CInputDlg
 #include "Dlsbank.h"
 #include "Globals.h"
 #include "ImageLists.h"

Modified: trunk/OpenMPT/mptrack/view_com.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/view_com.cpp	Mon Oct 14 22:05:10 2024	(r21817)
+++ trunk/OpenMPT/mptrack/view_com.cpp	Mon Oct 14 23:50:13 2024	(r21818)
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "view_com.h"
-#include "ChannelManagerDlg.h"
 #include "Childfrm.h"
 #include "Clipboard.h"
 #include "Ctrl_com.h"
@@ -22,6 +21,7 @@
 #include "Moddoc.h"
 #include "Mptrack.h"
 #include "resource.h"
+#include "TrackerSettings.h"
 #include "WindowMessages.h"
 #include "../common/mptStringBuffer.h"
 #include "../soundlib/mod_specifications.h"

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

From: <sv...@op...> - 2024-10-14 20:05:17

Author: sagamusix
Date: Mon Oct 14 22:05:10 2024
New Revision: 21817
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21817

Log:
[Mod] STM: Fix typo in version number range (patch by cs127, https://github.com/OpenMPT/openmpt/pull/25).

Modified:
   trunk/OpenMPT/soundlib/Load_stm.cpp

Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp	Mon Oct 14 20:47:26 2024	(r21816)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp	Mon Oct 14 22:05:10 2024	(r21817)
@@ -240,7 +240,7 @@
 	if(!std::memcmp(fileHeader.trackerName, "!Scream!", 8))
 	{
 		if(fileHeader.verMinor >= 21)
-			m_modFormat.madeWithTracker = UL_("Scream Tracker 2.2 - 2.4 or compatible");
+			m_modFormat.madeWithTracker = UL_("Scream Tracker 2.2 - 2.3 or compatible");
 		else
 			m_modFormat.madeWithTracker = MPT_UFORMAT("Scream Tracker {}.{} or compatible")(fileHeader.verMajor, mpt::ufmt::dec0<2>(fileHeader.verMinor));
 	}

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

From: <sv...@op...> - 2024-10-14 18:47:39

Author: sagamusix
Date: Mon Oct 14 20:47:26 2024
New Revision: 21816
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21816

Log:
Merged revision(s) 21811, 21814 from trunk/OpenMPT:
[Imp] Keyboard config dialog: New shortcuts are now accepted by pressing the new "Set" button or by double-clicking into the shortcut field to improve accesibility (https://bugs.openmpt.org/view.php?id=1825).
........
[Fix] Key config dialog: Avoid focus staying on the disabled hotkey input.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp
   branches/OpenMPT-1.31/mptrack/KeyConfigDlg.h
   branches/OpenMPT-1.31/mptrack/mptrack.rc

Modified: branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Mon Oct 14 18:45:43 2024	(r21815)
+++ branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Mon Oct 14 20:47:26 2024	(r21816)
@@ -62,7 +62,7 @@
 
 BOOL CCustEdit::PreTranslateMessage(MSG *pMsg)
 {
-	if(pMsg)
+	if(pMsg && !m_bypassed)
 	{
 		if(pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
 		{
@@ -122,6 +122,7 @@
 	ON_LBN_SELCHANGE(IDC_COMMAND_LIST,    &COptionsKeyboard::OnCommandKeySelChanged)
 	ON_LBN_SELCHANGE(IDC_KEYCATEGORY,     &COptionsKeyboard::OnCategorySelChanged)
 	ON_EN_UPDATE(IDC_CHORDDETECTWAITTIME, &COptionsKeyboard::OnChordWaitTimeChanged)
+	ON_COMMAND(IDC_BUTTON1,               &COptionsKeyboard::OnListenForKeys)
 	ON_COMMAND(IDC_DELETE,                &COptionsKeyboard::OnDeleteKeyChoice)
 	ON_COMMAND(IDC_RESTORE,               &COptionsKeyboard::OnRestoreKeyChoice)
 	ON_COMMAND(IDC_LOAD,                  &COptionsKeyboard::OnLoad)
@@ -136,6 +137,7 @@
 	ON_EN_CHANGE(IDC_FIND,                &COptionsKeyboard::OnSearchTermChanged)
 	ON_EN_CHANGE(IDC_FINDHOTKEY,          &COptionsKeyboard::OnFindHotKey)
 	ON_EN_SETFOCUS(IDC_FINDHOTKEY,        &COptionsKeyboard::OnClearHotKey)
+	ON_WM_LBUTTONDBLCLK()
 	ON_WM_DESTROY()
 END_MESSAGE_MAP()
 
@@ -187,6 +189,8 @@
 	m_eReport.FmtLines(TRUE);
 	m_eReport.SetWindowText(_T(""));
 
+	EnableKeyChoice(false);
+
 	m_eChordWaitTime.SetWindowText(mpt::cfmt::val(TrackerSettings::Instance().gnAutoChordWaitTime.Get()));
 	return TRUE;
 }
@@ -522,19 +526,25 @@
 	const CommandID cmd = static_cast<CommandID>(m_lbnCommandKeys.GetItemData(m_lbnCommandKeys.GetCurSel()));
 	CString str;
 
+	EnableKeyChoice(false);
+
+	BOOL enableButton = (cmd == kcNull) ? FALSE : TRUE;
+	GetDlgItem(IDC_BUTTON1)->EnableWindow(enableButton);
+	GetDlgItem(IDC_DELETE)->EnableWindow(enableButton);
+	GetDlgItem(IDC_RESTORE)->EnableWindow(enableButton);
+	m_cmbKeyChoice.EnableWindow(enableButton);
+	m_bKeyDown.EnableWindow(enableButton);
+	m_bKeyHold.EnableWindow(enableButton);
+	m_bKeyUp.EnableWindow(enableButton);
+
 	//Separator
 	if(cmd == kcNull)
 	{
 		m_cmbKeyChoice.SetWindowText(_T(""));
-		m_cmbKeyChoice.EnableWindow(FALSE);
 		m_eCustHotKey.SetWindowText(_T(""));
-		m_eCustHotKey.EnableWindow(FALSE);
 		m_bKeyDown.SetCheck(0);
-		m_bKeyDown.EnableWindow(FALSE);
 		m_bKeyHold.SetCheck(0);
-		m_bKeyHold.EnableWindow(FALSE);
 		m_bKeyUp.SetCheck(0);
-		m_bKeyUp.EnableWindow(FALSE);
 		m_curCommand = kcNull;
 	}
 
@@ -543,12 +553,6 @@
 	{
 		m_forceUpdate = false;
 
-		m_cmbKeyChoice.EnableWindow(TRUE);
-		m_eCustHotKey.EnableWindow(TRUE);
-		m_bKeyDown.EnableWindow(TRUE);
-		m_bKeyHold.EnableWindow(TRUE);
-		m_bKeyUp.EnableWindow(TRUE);
-
 		m_curCommand = cmd;
 		m_curCategory = GetCategoryFromCommandID(cmd);
 
@@ -572,6 +576,8 @@
 //Fills or clears key choice info
 void COptionsKeyboard::OnKeyChoiceSelect()
 {
+	EnableKeyChoice(false);
+
 	int choice = static_cast<int>(m_cmbKeyChoice.GetItemData(m_cmbKeyChoice.GetCurSel()));
 	CommandID cmd = m_curCommand;
 
@@ -652,6 +658,36 @@
 	return;
 }
 
+
+void COptionsKeyboard::OnLButtonDblClk(UINT flags, CPoint point)
+{
+	ClientToScreen(&point);
+	CRect rect;
+	m_eCustHotKey.GetWindowRect(rect);
+	if(m_eCustHotKey.IsBypassed() && rect.PtInRect(point))
+		EnableKeyChoice(true);
+	else
+		CPropertyPage::OnLButtonDblClk(flags, point);
+}
+
+
+void COptionsKeyboard::OnListenForKeys()
+{
+	EnableKeyChoice(m_eCustHotKey.IsBypassed());
+}
+
+
+void COptionsKeyboard::EnableKeyChoice(bool enable)
+{
+	if(!enable && GetFocus() == &m_eCustHotKey)
+		GetDlgItem(IDC_BUTTON1)->SetFocus();
+	m_eCustHotKey.Bypass(!enable);
+	GetDlgItem(IDC_BUTTON1)->SetWindowText(enable ? _T("Cancel") : _T("&Set"));
+	if(enable)
+		m_eCustHotKey.SetFocus();
+}
+
+
 void COptionsKeyboard::OnDeleteKeyChoice()
 {
 	CommandID cmd = m_curCommand;
@@ -673,6 +709,8 @@
 
 void COptionsKeyboard::OnSetKeyChoice()
 {
+	EnableKeyChoice(false);
+
 	CommandID cmd = m_curCommand;
 	if(cmd == kcNull)
 	{

Modified: branches/OpenMPT-1.31/mptrack/KeyConfigDlg.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/KeyConfigDlg.h	Mon Oct 14 18:45:43 2024	(r21815)
+++ branches/OpenMPT-1.31/mptrack/KeyConfigDlg.h	Mon Oct 14 20:47:26 2024	(r21816)
@@ -47,6 +47,7 @@
 	HWND m_hParent = nullptr;
 	UINT m_nCtrlId = 0;
 	bool m_isFocussed = false, m_isDummy = false;
+	bool m_bypassed = false;
 
 public:
 	FlagSet<Modifiers> mod = ModNone;
@@ -60,6 +61,9 @@
 		m_pOptKeyDlg = pOKD;
 	}
 	void SetKey(FlagSet<Modifiers> mod, UINT code);
+
+	void Bypass(bool bypass) { m_bypassed = bypass; EnableWindow(bypass ? FALSE : TRUE); }
+	bool IsBypassed() const { return m_bypassed; }
 	
 protected:
 	BOOL PreTranslateMessage(MSG *pMsg) override;
@@ -114,6 +118,8 @@
 	void UnlockControls() { m_lockCount--; MPT_ASSERT(m_lockCount >= 0); }
 	bool IsLocked() const noexcept { return m_lockCount != 0; }
 
+	void EnableKeyChoice(bool enable);
+
 	afx_msg void UpdateDialog();
 	afx_msg void OnKeyboardChanged();
 	afx_msg void OnKeyChoiceSelect();
@@ -125,6 +131,7 @@
 	afx_msg void OnCheck() { OnSetKeyChoice(); };
 	afx_msg void OnNotesRepeat();
 	afx_msg void OnNoNotesRepeat();
+	afx_msg void OnListenForKeys();
 	afx_msg void OnDeleteKeyChoice();
 	afx_msg void OnRestoreKeyChoice();
 	afx_msg void OnLoad();
@@ -133,6 +140,7 @@
 	afx_msg void OnRestoreDefaultKeymap();
 	afx_msg void OnClearHotKey();
 	afx_msg void OnFindHotKey();
+	afx_msg void OnLButtonDblClk(UINT flags, CPoint point);
 	afx_msg void OnDestroy();
 
 	DECLARE_MESSAGE_MAP()

Modified: branches/OpenMPT-1.31/mptrack/mptrack.rc
==============================================================================
--- branches/OpenMPT-1.31/mptrack/mptrack.rc	Mon Oct 14 18:45:43 2024	(r21815)
+++ branches/OpenMPT-1.31/mptrack/mptrack.rc	Mon Oct 14 20:47:26 2024	(r21816)
@@ -1246,12 +1246,13 @@
     GROUPBOX        "Key setup for selected command ",IDC_STATIC,150,6,132,84
     COMBOBOX        IDC_CHOICECOMBO,156,18,78,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Key:",IDC_STATIC,156,38,16,8
-    EDITTEXT        IDC_CUSTHOTKEY,174,36,60,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CUSTHOTKEY,174,36,60,13,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "&Set",IDC_BUTTON1,240,36,37,13
+    PUSHBUTTON      "&Restore",IDC_RESTORE,240,54,37,13
+    PUSHBUTTON      "&Delete",IDC_DELETE,240,18,37,13
     CONTROL         "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,54,66,8
     CONTROL         "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,66,66,8
     CONTROL         "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,78,66,8
-    PUSHBUTTON      "Restore",IDC_RESTORE,240,36,37,13
-    PUSHBUTTON      "Delete",IDC_DELETE,240,18,37,13
     GROUPBOX        "Misc",IDC_STATIC,150,96,132,40
     LTEXT           "Repeat notes on hold?",IDC_STATIC,156,108,74,8
     PUSHBUTTON      "Yes",IDC_NOTESREPEAT,240,108,18,9
@@ -1259,11 +1260,11 @@
     LTEXT           "Chord detect interval (ms):",IDC_STATIC,156,122,88,8
     EDITTEXT        IDC_CHORDDETECTWAITTIME,246,120,30,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
     GROUPBOX        "Keyboard Mapping",IDC_STATIC,150,144,132,48
-    PUSHBUTTON      "Import Keys...",IDC_LOAD,156,156,54,13
-    PUSHBUTTON      "Export Keys...",IDC_SAVE,222,156,54,13
-    PUSHBUTTON      "Restore default configuration",IDC_RESTORE_KEYMAP,156,174,120,12
+    PUSHBUTTON      "&Import Keys...",IDC_LOAD,156,156,54,13
+    PUSHBUTTON      "&Export Keys...",IDC_SAVE,222,156,54,13
+    PUSHBUTTON      "Restore default &configuration",IDC_RESTORE_KEYMAP,156,174,120,12
     LTEXT           "Error Log:",IDC_STATIC,150,198,78,8
-    PUSHBUTTON      "Clear Log",IDC_CLEARLOG,239,196,42,12
+    PUSHBUTTON      "Clear &Log",IDC_CLEARLOG,239,196,42,12
     EDITTEXT        IDC_KEYREPORT,150,210,132,66,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
     EDITTEXT        IDC_FIND,30,264,54,12,ES_AUTOHSCROLL
     LTEXT           "Find:",IDC_STATIC,6,266,24,8

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

From: <sv...@op...> - 2024-10-14 16:45:57

Author: sagamusix
Date: Mon Oct 14 18:45:43 2024
New Revision: 21815
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21815

Log:
[Ref] Reduce usage of MAX_BASECHANNELS.

Modified:
   trunk/OpenMPT/mptrack/View_gen.cpp
   trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/View_gen.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp	Mon Oct 14 18:37:03 2024	(r21814)
+++ trunk/OpenMPT/mptrack/View_gen.cpp	Mon Oct 14 18:45:43 2024	(r21815)
@@ -804,14 +804,11 @@
 
 void CViewGlobals::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar)
 {
-	CModDoc *pModDoc;
-	CHANNELINDEX nChn;
-
 	CFormView::OnHScroll(nSBCode, nPos, pScrollBar);
 
-	pModDoc = GetDocument();
-	nChn = (CHANNELINDEX)(m_nActiveTab * CHANNELS_IN_TAB);
-	if ((pModDoc) && (!IsLocked()) && (nChn < MAX_BASECHANNELS))
+	CModDoc *pModDoc = GetDocument();
+	const CHANNELINDEX nChn = (CHANNELINDEX)(m_nActiveTab * CHANNELS_IN_TAB);
+	if(pModDoc && !IsLocked() && nChn < pModDoc->GetNumChannels())
 	{
 		BOOL bUpdate = FALSE;
 		short int pos;
@@ -850,7 +847,6 @@
 			}
 		}
 
-
 		if ((pScrollBar) && (pScrollBar->m_hWnd == m_sbDryRatio.m_hWnd))
 		{
 			int n = 100 - m_sbDryRatio.GetPos();

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	Mon Oct 14 18:37:03 2024	(r21814)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	Mon Oct 14 18:45:43 2024	(r21815)
@@ -1330,7 +1330,7 @@
 		break;
 
 	case DragItem::PluginName:
-		if(sourceChn < MAX_BASECHANNELS)
+		if(sourceChn < modDoc->GetNumChannels())
 			TogglePluginEditor(sourceChn);
 		break;
 	}
@@ -1565,7 +1565,7 @@
 	case DragItem::ChannelHeader:
 		if(nFlags & MK_SHIFT)
 		{
-			if(sourceChn < MAX_BASECHANNELS && sourceChn == targetChn)
+			if(sourceChn < pModDoc->GetNumChannels() && sourceChn == targetChn)
 			{
 				pModDoc->ToggleChannelRecordGroup(sourceChn, RecordGroup::Group2);
 				InvalidateChannelsHeaders(sourceChn);
@@ -7283,7 +7283,7 @@
 			// Whole channel is already selected => expand selection to whole row.
 			startChannel = 0;
 			startColumn = PatternCursor::firstColumn;
-			endChannel = MAX_BASECHANNELS;
+			endChannel = GetDocument()->GetNumChannels() - 1;
 			endColumn = PatternCursor::lastColumn;
 		} else
 		{

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

From: <sv...@op...> - 2024-10-14 16:37:16

Author: sagamusix
Date: Mon Oct 14 18:37:03 2024
New Revision: 21814
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21814

Log:
[Fix] Key config dialog: Avoid focus staying on the disabled hotkey input.

Modified:
   trunk/OpenMPT/mptrack/KeyConfigDlg.cpp

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	Sun Oct 13 23:00:21 2024	(r21813)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	Mon Oct 14 18:37:03 2024	(r21814)
@@ -787,6 +787,8 @@
 
 void COptionsKeyboard::EnableKeyChoice(bool enable)
 {
+	if(!enable && GetFocus() == &m_eCustHotKey)
+		GetDlgItem(IDC_BUTTON1)->SetFocus();
 	m_eCustHotKey.Bypass(!enable);
 	GetDlgItem(IDC_BUTTON1)->SetWindowText(enable ? _T("Cancel") : _T("&Set"));
 	if(enable)

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

From: <sv...@op...> - 2024-10-13 21:00:32

Author: sagamusix
Date: Sun Oct 13 23:00:21 2024
New Revision: 21813
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21813

Log:
[Imp] S3M: Make it obvious that tracker ID 0x1320 may also refer to Scream Tracker 3.21. Patch by cs127 (https://github.com/OpenMPT/openmpt/pull/24).

Modified:
   trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Sun Oct 13 22:56:47 2024	(r21812)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Sun Oct 13 23:00:21 2024	(r21813)
@@ -283,9 +283,16 @@
 			// though several ST3.01/3.03 files with ultra-click values of 16 have been found as well.
 			// However, we won't fingerprint these values here as it's unlikely that there is any other tracker out there disguising as ST3 and using a strange ultra-click value.
 			// Also, re-saving a file with a strange ultra-click value in ST3 doesn't fix this value unless the user manually changes it, or if it's below 16.
-			madeWithTracker = UL_("Scream Tracker");
-			formatTrackerStr = true;
 			isST3 = true;
+			if(fileHeader.cwtv == S3MFileHeader::trkST3_20)
+			{
+				// 3.21 writes the version number as 3.20. There is no known way to differentiate between the two.
+				madeWithTracker = UL_("Scream Tracker 3.20 - 3.21");
+			} else
+			{
+				madeWithTracker = UL_("Scream Tracker");
+				formatTrackerStr = true;
+			}
 		}
 		break;
 	case S3MFileHeader::trkImagoOrpheus:

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

From: <sv...@op...> - 2024-10-13 20:56:58

Author: sagamusix
Date: Sun Oct 13 22:56:47 2024
New Revision: 21812
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21812

Log:
[Mod] SymMOD: Load SymMOD files with more than 127 channels. Fixes Fly-mix.SymMOD (https://www.un4seen.com/forum/?topic=15448.msg143952#msg143952).

Modified:
   trunk/OpenMPT/soundlib/Load_symmod.cpp

Modified: trunk/OpenMPT/soundlib/Load_symmod.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_symmod.cpp	Sun Oct 13 21:01:44 2024	(r21811)
+++ trunk/OpenMPT/soundlib/Load_symmod.cpp	Sun Oct 13 22:56:47 2024	(r21812)
@@ -44,7 +44,7 @@
 		return !std::memcmp(magic, "SymM", 4)
 			&& version == 1
 			&& firstChunkID == -1
-			&& numChannels > 0 && numChannels <= MAX_BASECHANNELS;
+			&& numChannels > 0 && numChannels <= 256;
 	}
 };
 
@@ -1006,7 +1006,7 @@
 	else if(loadFlags == onlyVerifyHeader)
 		return true;
 
-	InitializeGlobals(MOD_TYPE_MPT, static_cast<CHANNELINDEX>(fileHeader.numChannels));
+	InitializeGlobals(MOD_TYPE_MPT, std::min(MAX_BASECHANNELS, static_cast<CHANNELINDEX>(fileHeader.numChannels)));
 
 	m_SongFlags.set(SONG_LINEARSLIDES | SONG_EXFILTERRANGE | SONG_AUTO_VIBRATO | SONG_AUTO_TREMOLO | SONG_IMPORTED);
 	m_playBehaviour = GetDefaultPlaybackBehaviour(MOD_TYPE_IT);
@@ -1307,7 +1307,7 @@
 	std::map<SymEvent, uint8> macroMap;
 
 	bool useDSP = false;
-	const uint32 patternSize = GetNumChannels() * trackLen;
+	const uint32 patternSize = fileHeader.numChannels * trackLen;
 	const PATTERNINDEX numPatterns = mpt::saturate_cast<PATTERNINDEX>(patternData.size() / patternSize);
 
 	Patterns.ResizeArray(numPatterns);
@@ -1384,7 +1384,7 @@
 				uint8 patternSpeed = static_cast<uint8>(pos.speed);
 
 				// This may intentionally read into the next pattern
-				auto srcEvent = patternData.cbegin() + (pos.pattern * patternSize) + (pos.start * GetNumChannels());
+				auto srcEvent = patternData.cbegin() + (pos.pattern * patternSize) + (pos.start * fileHeader.numChannels);
 				const SymEvent emptyEvent{};
 				ModCommand syncPlayCommand;
 				for(ROWINDEX row = 0; row < pos.length; row++)

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

From: <sv...@op...> - 2024-10-13 19:01:56

Author: sagamusix
Date: Sun Oct 13 21:01:44 2024
New Revision: 21811
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21811

Log:
[Imp] Keyboard config dialog: New shortcuts are now accepted by pressing the new "Set" button or by double-clicking into the shortcut field to improve accesibility (https://bugs.openmpt.org/view.php?id=1825).

Modified:
   trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
   trunk/OpenMPT/mptrack/KeyConfigDlg.h
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	Sun Oct 13 19:33:55 2024	(r21810)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	Sun Oct 13 21:01:44 2024	(r21811)
@@ -73,7 +73,7 @@
 
 BOOL CCustEdit::PreTranslateMessage(MSG *pMsg)
 {
-	if(pMsg)
+	if(pMsg && !m_bypassed)
 	{
 		if(pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
 		{
@@ -134,6 +134,7 @@
 	ON_LBN_SELCHANGE(IDC_CHOICECOMBO,     &COptionsKeyboard::OnKeyChoiceSelect)
 	ON_LBN_SELCHANGE(IDC_KEYCATEGORY,     &COptionsKeyboard::OnCategorySelChanged)
 	ON_EN_UPDATE(IDC_CHORDDETECTWAITTIME, &COptionsKeyboard::OnChordWaitTimeChanged)
+	ON_COMMAND(IDC_BUTTON1,               &COptionsKeyboard::OnListenForKeys)
 	ON_COMMAND(IDC_DELETE,                &COptionsKeyboard::OnDeleteKeyChoice)
 	ON_COMMAND(IDC_RESTORE,               &COptionsKeyboard::OnRestoreKeyChoice)
 	ON_COMMAND(IDC_LOAD,                  &COptionsKeyboard::OnLoad)
@@ -148,6 +149,7 @@
 	ON_EN_CHANGE(IDC_FIND,                &COptionsKeyboard::OnSearchTermChanged)
 	ON_EN_CHANGE(IDC_FINDHOTKEY,          &COptionsKeyboard::OnFindHotKey)
 	ON_EN_SETFOCUS(IDC_FINDHOTKEY,        &COptionsKeyboard::OnClearHotKey)
+	ON_WM_LBUTTONDBLCLK()
 	ON_WM_DESTROY()
 END_MESSAGE_MAP()
 
@@ -205,6 +207,8 @@
 	m_eReport.FmtLines(TRUE);
 	m_eReport.SetWindowText(_T(""));
 
+	EnableKeyChoice(false);
+
 	m_eChordWaitTime.SetWindowText(mpt::cfmt::val(TrackerSettings::Instance().gnAutoChordWaitTime.Get()));
 	return TRUE;
 }
@@ -630,19 +634,25 @@
 	const CommandID cmd = (selectedItem >= 0) ? static_cast<CommandID>(m_lbnCommandKeys.GetItemData(selectedItem)) : kcNull;
 	CString str;
 
+	EnableKeyChoice(false);
+
+	BOOL enableButton = (cmd == kcNull) ? FALSE : TRUE;
+	GetDlgItem(IDC_BUTTON1)->EnableWindow(enableButton);
+	GetDlgItem(IDC_DELETE)->EnableWindow(enableButton);
+	GetDlgItem(IDC_RESTORE)->EnableWindow(enableButton);
+	m_cmbKeyChoice.EnableWindow(enableButton);
+	m_bKeyDown.EnableWindow(enableButton);
+	m_bKeyHold.EnableWindow(enableButton);
+	m_bKeyUp.EnableWindow(enableButton);
+
 	//Separator
 	if(cmd == kcNull)
 	{
 		m_cmbKeyChoice.SetWindowText(_T(""));
-		m_cmbKeyChoice.EnableWindow(FALSE);
 		m_eCustHotKey.SetWindowText(_T(""));
-		m_eCustHotKey.EnableWindow(FALSE);
 		m_bKeyDown.SetCheck(0);
-		m_bKeyDown.EnableWindow(FALSE);
 		m_bKeyHold.SetCheck(0);
-		m_bKeyHold.EnableWindow(FALSE);
 		m_bKeyUp.SetCheck(0);
-		m_bKeyUp.EnableWindow(FALSE);
 		m_curCommand = kcNull;
 	}
 
@@ -651,12 +661,6 @@
 	{
 		m_forceUpdate = false;
 
-		m_cmbKeyChoice.EnableWindow(TRUE);
-		m_eCustHotKey.EnableWindow(TRUE);
-		m_bKeyDown.EnableWindow(TRUE);
-		m_bKeyHold.EnableWindow(TRUE);
-		m_bKeyUp.EnableWindow(TRUE);
-
 		m_curCommand = cmd;
 		m_curCategory = GetCategoryFromCommandID(cmd);
 
@@ -680,6 +684,8 @@
 //Fills or clears key choice info
 void COptionsKeyboard::OnKeyChoiceSelect()
 {
+	EnableKeyChoice(false);
+
 	int choice = static_cast<int>(m_cmbKeyChoice.GetItemData(m_cmbKeyChoice.GetCurSel()));
 	CommandID cmd = m_curCommand;
 
@@ -760,6 +766,34 @@
 	return;
 }
 
+
+void COptionsKeyboard::OnLButtonDblClk(UINT flags, CPoint point)
+{
+	ClientToScreen(&point);
+	CRect rect;
+	m_eCustHotKey.GetWindowRect(rect);
+	if(m_eCustHotKey.IsBypassed() && rect.PtInRect(point))
+		EnableKeyChoice(true);
+	else
+		CPropertyPage::OnLButtonDblClk(flags, point);
+}
+
+
+void COptionsKeyboard::OnListenForKeys()
+{
+	EnableKeyChoice(m_eCustHotKey.IsBypassed());
+}
+
+
+void COptionsKeyboard::EnableKeyChoice(bool enable)
+{
+	m_eCustHotKey.Bypass(!enable);
+	GetDlgItem(IDC_BUTTON1)->SetWindowText(enable ? _T("Cancel") : _T("&Set"));
+	if(enable)
+		m_eCustHotKey.SetFocus();
+}
+
+
 void COptionsKeyboard::OnDeleteKeyChoice()
 {
 	CommandID cmd = m_curCommand;
@@ -781,6 +815,8 @@
 
 void COptionsKeyboard::OnSetKeyChoice()
 {
+	EnableKeyChoice(false);
+
 	CommandID cmd = m_curCommand;
 	if(cmd == kcNull)
 	{

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.h
==============================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.h	Sun Oct 13 19:33:55 2024	(r21810)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.h	Sun Oct 13 21:01:44 2024	(r21811)
@@ -46,6 +46,7 @@
 	HWND m_hParent = nullptr;
 	UINT m_nCtrlId = 0;
 	bool m_isFocussed = false, m_isDummy = false;
+	bool m_bypassed = false;
 
 public:
 	FlagSet<Modifiers> mod = ModNone;
@@ -59,6 +60,9 @@
 		m_pOptKeyDlg = pOKD;
 	}
 	void SetKey(FlagSet<Modifiers> mod, UINT code);
+
+	void Bypass(bool bypass) { m_bypassed = bypass; EnableWindow(bypass ? FALSE : TRUE); }
+	bool IsBypassed() const { return m_bypassed; }
 	
 protected:
 	BOOL PreTranslateMessage(MSG *pMsg) override;
@@ -115,6 +119,8 @@
 	void UnlockControls() { m_lockCount--; MPT_ASSERT(m_lockCount >= 0); }
 	bool IsLocked() const noexcept { return m_lockCount != 0; }
 
+	void EnableKeyChoice(bool enable);
+
 	afx_msg void UpdateDialog();
 	afx_msg void OnKeyboardChanged();
 	afx_msg void OnKeyChoiceSelect();
@@ -126,6 +132,7 @@
 	afx_msg void OnCheck() { OnSetKeyChoice(); };
 	afx_msg void OnNotesRepeat();
 	afx_msg void OnNoNotesRepeat();
+	afx_msg void OnListenForKeys();
 	afx_msg void OnDeleteKeyChoice();
 	afx_msg void OnRestoreKeyChoice();
 	afx_msg void OnLoad();
@@ -134,6 +141,7 @@
 	afx_msg void OnRestoreDefaultKeymap();
 	afx_msg void OnClearHotKey();
 	afx_msg void OnFindHotKey();
+	afx_msg void OnLButtonDblClk(UINT flags, CPoint point);
 	afx_msg void OnDestroy();
 
 	DECLARE_MESSAGE_MAP()

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Sun Oct 13 19:33:55 2024	(r21810)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Sun Oct 13 21:01:44 2024	(r21811)
@@ -1251,12 +1251,13 @@
     GROUPBOX        "Key setup for selected command ",IDC_STATIC,150,6,132,84
     COMBOBOX        IDC_CHOICECOMBO,156,18,78,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Key:",IDC_STATIC,156,38,16,8
-    EDITTEXT        IDC_CUSTHOTKEY,174,36,60,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CUSTHOTKEY,174,36,60,13,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "&Set",IDC_BUTTON1,240,36,37,13
+    PUSHBUTTON      "&Restore",IDC_RESTORE,240,54,37,13
+    PUSHBUTTON      "&Delete",IDC_DELETE,240,18,37,13
     CONTROL         "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,54,66,8
     CONTROL         "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,66,66,8
     CONTROL         "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,78,66,8
-    PUSHBUTTON      "Restore",IDC_RESTORE,240,36,37,13
-    PUSHBUTTON      "Delete",IDC_DELETE,240,18,37,13
     GROUPBOX        "Misc",IDC_STATIC,150,96,132,40
     LTEXT           "Repeat notes on hold?",IDC_STATIC,156,108,74,8
     PUSHBUTTON      "Yes",IDC_NOTESREPEAT,240,108,18,9
@@ -1264,11 +1265,11 @@
     LTEXT           "Chord detect interval (ms):",IDC_STATIC,156,122,88,8
     EDITTEXT        IDC_CHORDDETECTWAITTIME,246,120,30,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
     GROUPBOX        "Keyboard Mapping",IDC_STATIC,150,144,132,48
-    PUSHBUTTON      "Import Keys...",IDC_LOAD,156,156,54,13
-    PUSHBUTTON      "Export Keys...",IDC_SAVE,222,156,54,13
-    PUSHBUTTON      "Restore default configuration",IDC_RESTORE_KEYMAP,156,174,120,12
+    PUSHBUTTON      "&Import Keys...",IDC_LOAD,156,156,54,13
+    PUSHBUTTON      "&Export Keys...",IDC_SAVE,222,156,54,13
+    PUSHBUTTON      "Restore default &configuration",IDC_RESTORE_KEYMAP,156,174,120,12
     LTEXT           "Error Log:",IDC_STATIC,150,198,78,8
-    PUSHBUTTON      "Clear Log",IDC_CLEARLOG,239,196,42,12
+    PUSHBUTTON      "Clear &Log",IDC_CLEARLOG,239,196,42,12
     EDITTEXT        IDC_KEYREPORT,150,210,132,66,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
     EDITTEXT        IDC_FIND,30,264,54,12,ES_AUTOHSCROLL
     LTEXT           "Find:",IDC_STATIC,6,266,24,8

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

From: <sv...@op...> - 2024-10-13 17:34:03

Author: sagamusix
Date: Sun Oct 13 19:33:55 2024
New Revision: 21810
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21810

Log:
[Imp] STM: Map known tracker IDs to "made with" tracker string (patch by cs127, https://github.com/OpenMPT/openmpt/pull/23/files)

Modified:
   trunk/OpenMPT/soundlib/Load_stm.cpp

Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp	Sun Oct 13 18:44:31 2024	(r21809)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp	Sun Oct 13 19:33:55 2024	(r21810)
@@ -235,9 +235,24 @@
 
 	m_modFormat.formatName = UL_("Scream Tracker 2");
 	m_modFormat.type = UL_("stm");
-	m_modFormat.madeWithTracker = MPT_UFORMAT("Scream Tracker {}.{}")(fileHeader.verMajor, mpt::ufmt::dec0<2>(fileHeader.verMinor));
 	m_modFormat.charset = mpt::Charset::CP437;
 
+	if(!std::memcmp(fileHeader.trackerName, "!Scream!", 8))
+	{
+		if(fileHeader.verMinor >= 21)
+			m_modFormat.madeWithTracker = UL_("Scream Tracker 2.2 - 2.4 or compatible");
+		else
+			m_modFormat.madeWithTracker = MPT_UFORMAT("Scream Tracker {}.{} or compatible")(fileHeader.verMajor, mpt::ufmt::dec0<2>(fileHeader.verMinor));
+	}
+	else if(!std::memcmp(fileHeader.trackerName, "BMOD2STM", 8))
+		m_modFormat.madeWithTracker = UL_("BMOD2STM");
+	else if(!std::memcmp(fileHeader.trackerName, "WUZAMOD!", 8))
+		m_modFormat.madeWithTracker = UL_("Wuzamod");
+	else if(!std::memcmp(fileHeader.trackerName, "SWavePro", 8))
+		m_modFormat.madeWithTracker = UL_("SoundWave Pro");
+	else
+		m_modFormat.madeWithTracker = UL_("Unknown");
+
 	m_playBehaviour.set(kST3SampleSwap);
 
 	m_nSamples = 31;

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

From: <sv...@op...> - 2024-10-13 16:44:43

Author: sagamusix
Date: Sun Oct 13 18:44:31 2024
New Revision: 21809
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21809

Log:
[Mod] IT: Double portamento command behaviour was backported to Schism Tracker. Enable the compatibility flag accordingly.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Sun Oct 13 18:18:14 2024	(r21808)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Sun Oct 13 18:44:31 2024	(r21809)
@@ -1278,6 +1278,7 @@
 					{SchismVersionFromDate<2024,  5, 12>::date, kITNoSustainOnPortamento      },  // https://github.com/schismtracker/schismtracker/commit/6f68f2855a7e5e4ffe825869244e631e15741037
 					{SchismVersionFromDate<2024,  5, 12>::date, kITEmptyNoteMapSlotIgnoreCell },  // https://github.com/schismtracker/schismtracker/commit/aa84148e019a65f3d52ecd33fd84bfecfdb87bf4
 					{SchismVersionFromDate<2024,  5, 27>::date, kITOffsetWithInstrNumber      },  // https://github.com/schismtracker/schismtracker/commit/9237960d45079a54ad73f87bacfe5dd8ae82e273
+					{SchismVersionFromDate<2024, 10, 13>::date, kITDoublePortamentoSlides     },  // https://github.com/schismtracker/schismtracker/commit/223e327d9448561931b8cac8a55180286b17276c
 				};
 				for(const auto &quirk : SchismQuirks)
 				{

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

From: <sv...@op...> - 2024-10-13 16:18:28

Author: sagamusix
Date: Sun Oct 13 18:18:14 2024
New Revision: 21808
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21808

Log:
[Ref] Simplify r21807. One observation was apparently incorrect and based on an intermediate understanding of the inner workings of IT.

Modified:
   trunk/OpenMPT/soundlib/Snd_fx.cpp
   trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	Sun Oct 13 17:05:19 2024	(r21807)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	Sun Oct 13 18:18:14 2024	(r21808)
@@ -138,7 +138,7 @@
 				case VOLCMD_TONEPORTAMENTO:
 					{
 						const auto [porta, clearEffectCommand] = sndFile.GetVolCmdTonePorta(m, 0);
-						sndFile.TonePortamento(*state, channel, porta, true);
+						sndFile.TonePortamento(*state, channel, porta);
 						if(clearEffectCommand)
 							command = CMD_NONE;
 					}
@@ -155,10 +155,10 @@
 				switch(command)
 				{
 				case CMD_TONEPORTAMENTO:
-					sndFile.TonePortamento(*state, channel, m.param, false);
+					sndFile.TonePortamento(*state, channel, m.param);
 					break;
 				case CMD_TONEPORTAVOL:
-					sndFile.TonePortamento(*state, channel, 0, false);
+					sndFile.TonePortamento(*state, channel, 0);
 					break;
 				case CMD_PORTAMENTOUP:
 					if(m.param || !(sndFile.GetType() & MOD_TYPE_MOD))
@@ -193,7 +193,7 @@
 				}
 
 				if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamento) && !chn.rowCommand.IsTonePortamento())
-					sndFile.TonePortamento(*state, channel, chn.portamentoSlide, false);
+					sndFile.TonePortamento(*state, channel, chn.portamentoSlide);
 				else if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamentoWithDuration))
 					sndFile.TonePortamentoWithDuration(chn, 0);
 				if(chn.autoSlide.IsActive(AutoSlideCommand::PortamentoUp))
@@ -3147,7 +3147,7 @@
 		}
 
 		// IT compatibility: Various mind-boggling behaviours when combining volume colum and effect column portamentos
-		// The most crucial thing here is to initialize effect memory in the exact right order, and use different effect memory for tone portamento in the both columns.
+		// The most crucial thing here is to initialize effect memory in the exact right order.
 		// Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
 		if(m_playBehaviour[kITDoublePortamentoSlides] && chn.isFirstTick)
 		{
@@ -3179,7 +3179,7 @@
 				if(clearEffectCommand)
 					cmd = CMD_NONE;
 
-				TonePortamento(nChn, porta, true);
+				TonePortamento(nChn, porta);
 			} else
 			{
 				// FT2 Compatibility: FT2 ignores some volume commands with parameter = 0.
@@ -3359,13 +3359,13 @@
 
 		// Tone-Portamento
 		case CMD_TONEPORTAMENTO:
-			TonePortamento(nChn, static_cast<uint16>(param), false);
+			TonePortamento(nChn, static_cast<uint16>(param));
 			break;
 
 		// Tone-Portamento + Volume Slide
 		case CMD_TONEPORTAVOL:
 			if ((param) || (GetType() != MOD_TYPE_MOD)) VolumeSlide(chn, static_cast<ModCommand::PARAM>(param));
-			TonePortamento(nChn, 0, false);
+			TonePortamento(nChn, 0);
 			break;
 
 		// Vibrato
@@ -3899,7 +3899,7 @@
 {
 	ModChannel &chn = playState.Chn[channel];
 	if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamento) && !chn.rowCommand.IsTonePortamento())
-		TonePortamento(channel, chn.portamentoSlide, false);
+		TonePortamento(channel, chn.portamentoSlide);
 	else if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamentoWithDuration))
 		TonePortamentoWithDuration(chn);
 	if(chn.autoSlide.IsActive(AutoSlideCommand::PortamentoUp))
@@ -4445,9 +4445,9 @@
 }
 
 
-void CSoundFile::TonePortamento(CHANNELINDEX nChn, uint16 param, bool volumeColumn)
+void CSoundFile::TonePortamento(CHANNELINDEX nChn, uint16 param)
 {
-	auto delta = TonePortamento(m_PlayState, nChn, param, volumeColumn);
+	auto delta = TonePortamento(m_PlayState, nChn, param);
 	if(!delta)
 		return;
 
@@ -4466,29 +4466,18 @@
 
 
 // Portamento Slide
-int32 CSoundFile::TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param, bool volumeColumn) const
+int32 CSoundFile::TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param) const
 {
 	ModChannel &chn = playState.Chn[nChn];
 	chn.dwFlags.set(CHN_PORTAMENTO);
 	if(m_SongFlags[SONG_AUTO_TONEPORTA])
 		chn.autoSlide.SetActive(AutoSlideCommand::TonePortamento, param != 0 || m_SongFlags[SONG_AUTO_TONEPORTA_CONT]);
 
-	int32 delta;
 	// IT compatibility: Initialize effect memory in the right order in case there are portamentos in both effect columns.
-	// Also, tone portamento in the effect column stores the slide amount separately from the regular E/F/G memory once the effect is running,
-	// while volume column tone portamento always accesses the effect memory directly.
 	// Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
-	if(m_playBehaviour[kITDoublePortamentoSlides])
-	{
-		if(volumeColumn && TonePortamentoSharesEffectMemory())
-			delta = chn.nOldPortaUp;
-		else
-			delta = chn.portamentoSlide;
-	} else
-	{
+	if(!m_playBehaviour[kITDoublePortamentoSlides])
 		InitTonePortamento(chn, param);
-		delta = chn.portamentoSlide;
-	}
+	int32 delta = chn.portamentoSlide;
 
 	if(chn.HasCustomTuning())
 	{

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Sun Oct 13 17:05:19 2024	(r21807)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Sun Oct 13 18:18:14 2024	(r21808)
@@ -1088,8 +1088,8 @@
 	std::pair<uint16, bool> GetVolCmdTonePorta(const ModCommand &m, uint32 startTick) const;
 	bool TonePortamentoSharesEffectMemory() const;
 	void InitTonePortamento(ModChannel &chn, uint16 param) const;
-	void TonePortamento(CHANNELINDEX chn, uint16 param, bool volumeColumn);
-	int32 TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param, bool volumeColumn) const;
+	void TonePortamento(CHANNELINDEX chn, uint16 param);
+	int32 TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param) const;
 	void TonePortamentoWithDuration(ModChannel &chn, uint16 param = uint16_max) const;
 	void Vibrato(ModChannel &chn, uint32 param) const;
 	void FineVibrato(ModChannel &chn, uint32 param) const;

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

From: <sv...@op...> - 2024-10-13 15:05:32

Author: sagamusix
Date: Sun Oct 13 17:05:19 2024
New Revision: 21807
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21807

Log:
[Fix] IT: Fix various mind-boggling combinations of volume column and effect column portamento effects. Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
[Mod] OpenMPT: Version is now 1.32.00.26

Modified:
   trunk/OpenMPT/common/versionNumber.h
   trunk/OpenMPT/mptrack/dlg_misc.cpp
   trunk/OpenMPT/soundlib/Snd_defs.h
   trunk/OpenMPT/soundlib/Snd_fx.cpp
   trunk/OpenMPT/soundlib/Sndfile.cpp
   trunk/OpenMPT/soundlib/Sndfile.h
   trunk/OpenMPT/soundlib/UpgradeModule.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
==============================================================================
--- trunk/OpenMPT/common/versionNumber.h	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/common/versionNumber.h	Sun Oct 13 17:05:19 2024	(r21807)
@@ -16,4 +16,4 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      32
 #define VER_MINOR      00
-#define VER_MINORMINOR 26
+#define VER_MINORMINOR 27

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	Sun Oct 13 17:05:19 2024	(r21807)
@@ -730,6 +730,7 @@
 		case kITOffsetWithInstrNumber: desc = _T("Offset command with instrument number recalls offset with last note"); break;
 		case kContinueSampleWithoutInstr: desc = _T("New note without instrument number does not play looped samples from the start"); break;
 		case kMIDINotesFromChannelPlugin: desc = _T("MIDI notes can be sent to channel plugins"); break;
+		case kITDoublePortamentoSlides: desc = _T("Parameters of conflicting volume and effect column portamento commands may overwrite each other"); break;
 
 		default: MPT_ASSERT_NOTREACHED();
 		}

Modified: trunk/OpenMPT/soundlib/Snd_defs.h
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/soundlib/Snd_defs.h	Sun Oct 13 17:05:19 2024	(r21807)
@@ -598,6 +598,7 @@
 	kITOffsetWithInstrNumber,       // IT applies offset commands even if just an instrument number without note is present
 	kContinueSampleWithoutInstr,    // FTM: A note without instrument number continues looped samples with the new pitch instead of retriggering them
 	kMIDINotesFromChannelPlugin,    // Behaviour before OpenMPT 1.26: Channel plugin can be used to send MIDI notes
+	kITDoublePortamentoSlides,      // IT only reads parameters once per row, so if two commands sharing effect parameters are found in the two effect columns, they influence each other
 
 	// Add new play behaviours here.
 

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	Sun Oct 13 17:05:19 2024	(r21807)
@@ -138,7 +138,7 @@
 				case VOLCMD_TONEPORTAMENTO:
 					{
 						const auto [porta, clearEffectCommand] = sndFile.GetVolCmdTonePorta(m, 0);
-						sndFile.TonePortamento(*state, channel, porta);
+						sndFile.TonePortamento(*state, channel, porta, true);
 						if(clearEffectCommand)
 							command = CMD_NONE;
 					}
@@ -155,10 +155,10 @@
 				switch(command)
 				{
 				case CMD_TONEPORTAMENTO:
-					sndFile.TonePortamento(*state, channel, m.param);
+					sndFile.TonePortamento(*state, channel, m.param, false);
 					break;
 				case CMD_TONEPORTAVOL:
-					sndFile.TonePortamento(*state, channel, 0);
+					sndFile.TonePortamento(*state, channel, 0, false);
 					break;
 				case CMD_PORTAMENTOUP:
 					if(m.param || !(sndFile.GetType() & MOD_TYPE_MOD))
@@ -193,7 +193,7 @@
 				}
 
 				if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamento) && !chn.rowCommand.IsTonePortamento())
-					sndFile.TonePortamento(*state, channel, chn.portamentoSlide);
+					sndFile.TonePortamento(*state, channel, chn.portamentoSlide, false);
 				else if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamentoWithDuration))
 					sndFile.TonePortamentoWithDuration(chn, 0);
 				if(chn.autoSlide.IsActive(AutoSlideCommand::PortamentoUp))
@@ -3145,6 +3145,32 @@
 		{
 			doVolumeColumn = m_PlayState.m_nTickCount != 0 && (m_PlayState.m_nTickCount != nStartTick || (chn.rowCommand.instr == 0 && volcmd != VOLCMD_TONEPORTAMENTO));
 		}
+
+		// IT compatibility: Various mind-boggling behaviours when combining volume colum and effect column portamentos
+		// The most crucial thing here is to initialize effect memory in the exact right order, and use different effect memory for tone portamento in the both columns.
+		// Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
+		if(m_playBehaviour[kITDoublePortamentoSlides] && chn.isFirstTick)
+		{
+			const bool effectColumnTonePorta = (cmd == CMD_TONEPORTAMENTO || cmd == CMD_TONEPORTAVOL);
+			if(effectColumnTonePorta)
+				InitTonePortamento(chn, static_cast<uint16>(param));
+			if(volcmd == VOLCMD_TONEPORTAMENTO)
+				InitTonePortamento(chn, GetVolCmdTonePorta(chn.rowCommand, nStartTick).first);
+
+			if(vol && (volcmd == VOLCMD_PORTAUP || volcmd == VOLCMD_PORTADOWN))
+			{
+				chn.nOldPortaUp = chn.nOldPortaDown = vol << 2;
+				if(!effectColumnTonePorta && TonePortamentoSharesEffectMemory())
+					chn.portamentoSlide = vol << 2;
+			}
+			if(param && (cmd == CMD_PORTAMENTOUP || cmd == CMD_PORTAMENTODOWN))
+			{
+				chn.nOldPortaUp = chn.nOldPortaDown = static_cast<uint8>(param);
+				if(TonePortamentoSharesEffectMemory())
+					chn.portamentoSlide = static_cast<uint16>(param);
+			}
+		}
+
 		if(volcmd > VOLCMD_PANNING && doVolumeColumn)
 		{
 			if(volcmd == VOLCMD_TONEPORTAMENTO)
@@ -3153,7 +3179,7 @@
 				if(clearEffectCommand)
 					cmd = CMD_NONE;
 
-				TonePortamento(nChn, porta);
+				TonePortamento(nChn, porta, true);
 			} else
 			{
 				// FT2 Compatibility: FT2 ignores some volume commands with parameter = 0.
@@ -3333,13 +3359,13 @@
 
 		// Tone-Portamento
 		case CMD_TONEPORTAMENTO:
-			TonePortamento(nChn, static_cast<uint16>(param));
+			TonePortamento(nChn, static_cast<uint16>(param), false);
 			break;
 
 		// Tone-Portamento + Volume Slide
 		case CMD_TONEPORTAVOL:
 			if ((param) || (GetType() != MOD_TYPE_MOD)) VolumeSlide(chn, static_cast<ModCommand::PARAM>(param));
-			TonePortamento(nChn, 0);
+			TonePortamento(nChn, 0, false);
 			break;
 
 		// Vibrato
@@ -3873,7 +3899,7 @@
 {
 	ModChannel &chn = playState.Chn[channel];
 	if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamento) && !chn.rowCommand.IsTonePortamento())
-		TonePortamento(channel, chn.portamentoSlide);
+		TonePortamento(channel, chn.portamentoSlide, false);
 	else if(chn.autoSlide.IsActive(AutoSlideCommand::TonePortamentoWithDuration))
 		TonePortamentoWithDuration(chn);
 	if(chn.autoSlide.IsActive(AutoSlideCommand::PortamentoUp))
@@ -4027,7 +4053,9 @@
 {
 	ModChannel &chn = playState.Chn[nChn];
 
-	if(param)
+	// IT compatibility: Initialize effect memory in the right order in case there are portamentos in both effect columns.
+	// Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
+	if(param && !m_playBehaviour[kITDoublePortamentoSlides])
 	{
 		// FT2 compatibility: Separate effect memory for all portamento commands
 		// Test case: Porta-LinkMem.xm
@@ -4098,7 +4126,9 @@
 {
 	ModChannel &chn = playState.Chn[nChn];
 
-	if(param)
+	// IT compatibility: Initialize effect memory in the right order in case there are portamentos in both effect columns.
+	// Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
+	if(param && !m_playBehaviour[kITDoublePortamentoSlides])
 	{
 		// FT2 compatibility: Separate effect memory for all portamento commands
 		// Test case: Porta-LinkMem.xm
@@ -4394,9 +4424,30 @@
 }
 
 
-void CSoundFile::TonePortamento(CHANNELINDEX nChn, uint16 param)
+bool CSoundFile::TonePortamentoSharesEffectMemory() const
+{
+	return (!m_SongFlags[SONG_ITCOMPATGXX] && m_playBehaviour[kITPortaMemoryShare]) || GetType() == MOD_TYPE_PLM;
+}
+
+
+void CSoundFile::InitTonePortamento(ModChannel &chn, uint16 param) const
+{
+	// IT compatibility 03: Share effect memory with portamento up/down
+	if(TonePortamentoSharesEffectMemory())
+	{
+		if(param == 0)
+			param = chn.nOldPortaUp;
+		chn.nOldPortaUp = chn.nOldPortaDown = static_cast<uint8>(param);
+	}
+
+	if(param)
+		chn.portamentoSlide = param;
+}
+
+
+void CSoundFile::TonePortamento(CHANNELINDEX nChn, uint16 param, bool volumeColumn)
 {
-	auto delta = TonePortamento(m_PlayState, nChn, param);
+	auto delta = TonePortamento(m_PlayState, nChn, param, volumeColumn);
 	if(!delta)
 		return;
 
@@ -4415,33 +4466,39 @@
 
 
 // Portamento Slide
-int32 CSoundFile::TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param) const
+int32 CSoundFile::TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param, bool volumeColumn) const
 {
 	ModChannel &chn = playState.Chn[nChn];
 	chn.dwFlags.set(CHN_PORTAMENTO);
 	if(m_SongFlags[SONG_AUTO_TONEPORTA])
 		chn.autoSlide.SetActive(AutoSlideCommand::TonePortamento, param != 0 || m_SongFlags[SONG_AUTO_TONEPORTA_CONT]);
 
-	//IT compatibility 03: Share effect memory with portamento up/down
-	if((!m_SongFlags[SONG_ITCOMPATGXX] && m_playBehaviour[kITPortaMemoryShare]) || GetType() == MOD_TYPE_PLM)
+	int32 delta;
+	// IT compatibility: Initialize effect memory in the right order in case there are portamentos in both effect columns.
+	// Also, tone portamento in the effect column stores the slide amount separately from the regular E/F/G memory once the effect is running,
+	// while volume column tone portamento always accesses the effect memory directly.
+	// Test cases: DoubleSlide.it, DoubleSlideCompatGxx.it
+	if(m_playBehaviour[kITDoublePortamentoSlides])
 	{
-		if(param == 0) param = chn.nOldPortaUp;
-		chn.nOldPortaUp = chn.nOldPortaDown = static_cast<uint8>(param);
+		if(volumeColumn && TonePortamentoSharesEffectMemory())
+			delta = chn.nOldPortaUp;
+		else
+			delta = chn.portamentoSlide;
+	} else
+	{
+		InitTonePortamento(chn, param);
+		delta = chn.portamentoSlide;
 	}
 
-	if(param)
-		chn.portamentoSlide = param;
-
 	if(chn.HasCustomTuning())
 	{
 		//Behavior: Param tells number of finesteps(or 'fullsteps'(notes) with glissando)
 		//to slide per row(not per tick).
-		if(chn.portamentoSlide == 0)
+		if(delta == 0)
 			return 0;
 
 		const int32 oldPortamentoTickSlide = (playState.m_nTickCount != 0) ? chn.m_PortamentoTickSlide : 0;
 
-		int32 delta = chn.portamentoSlide;
 		if(chn.nPortamentoDest < 0)
 			delta = -delta;
 
@@ -4483,7 +4540,6 @@
 	               || (playState.m_nMusicSpeed == 1 && m_playBehaviour[kSlidesAtSpeed1])
 	               || m_SongFlags[SONG_FASTPORTAS];
 
-	int32 delta = chn.portamentoSlide;
 	if(GetType() == MOD_TYPE_PLM && delta >= 0xF0)
 	{
 		delta -= 0xF0;

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	Sun Oct 13 17:05:19 2024	(r21807)
@@ -1198,6 +1198,7 @@
 		playBehaviour.set(kITNoSustainOnPortamento);
 		playBehaviour.set(kITEmptyNoteMapSlotIgnoreCell);
 		playBehaviour.set(kITOffsetWithInstrNumber);
+		playBehaviour.set(kITDoublePortamentoSlides);
 		break;
 
 	case MOD_TYPE_XM:

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Sun Oct 13 17:05:19 2024	(r21807)
@@ -1086,8 +1086,10 @@
 	int16 CalculateFinetuneTarget(PATTERNINDEX pattern, ROWINDEX row, CHANNELINDEX channel) const;
 	void NoteSlide(ModChannel &chn, uint32 param, bool slideUp, bool retrig) const;
 	std::pair<uint16, bool> GetVolCmdTonePorta(const ModCommand &m, uint32 startTick) const;
-	void TonePortamento(CHANNELINDEX chn, uint16 param);
-	int32 TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param) const;
+	bool TonePortamentoSharesEffectMemory() const;
+	void InitTonePortamento(ModChannel &chn, uint16 param) const;
+	void TonePortamento(CHANNELINDEX chn, uint16 param, bool volumeColumn);
+	int32 TonePortamento(PlayState &playState, CHANNELINDEX nChn, uint16 param, bool volumeColumn) const;
 	void TonePortamentoWithDuration(ModChannel &chn, uint16 param = uint16_max) const;
 	void Vibrato(ModChannel &chn, uint32 param) const;
 	void FineVibrato(ModChannel &chn, uint32 param) const;

Modified: trunk/OpenMPT/soundlib/UpgradeModule.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/UpgradeModule.cpp	Sun Oct 13 15:06:10 2024	(r21806)
+++ trunk/OpenMPT/soundlib/UpgradeModule.cpp	Sun Oct 13 17:05:19 2024	(r21807)
@@ -601,6 +601,7 @@
 			{ kITNoSustainOnPortamento,       MPT_V("1.32.00.13") },
 			{ kITEmptyNoteMapSlotIgnoreCell,  MPT_V("1.32.00.13") },
 			{ kITOffsetWithInstrNumber,       MPT_V("1.32.00.15") },
+			{ kITDoublePortamentoSlides,      MPT_V("1.32.00.27") },
 		};
 
 		for(const auto &b : behaviours)

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

From: <sv...@op...> - 2024-10-13 13:06:17

Author: manx
Date: Sun Oct 13 15:06:10 2024
New Revision: 21806
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21806

Log:
Merged revision(s) 21805 from trunk/OpenMPT:
[Fix] build: Makefile: DJGPP: Also package DJGPP license files.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Sun Oct 13 15:04:56 2024	(r21805)
+++ branches/OpenMPT-1.31/Makefile	Sun Oct 13 15:06:10 2024	(r21806)
@@ -1873,6 +1873,11 @@
 	svn export ./include/miniz/miniz.c           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MINIZ.TXT   --native-eol CRLF
 	svn export ./include/stb_vorbis/stb_vorbis.c bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/STBVORB.TXT --native-eol CRLF
 endif
+	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/copying     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/COPYING
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/copying.dj  bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/COPYING.DJ
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/copying.lib bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/COPYING.LIB
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/source.txt  bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/SOURCE.TXT
 	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/SRC
 	cp build/externals/csdpmi7s.zip              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/SRC/CSDPMI7S.ZIP
 	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN

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

From: <sv...@op...> - 2024-10-13 13:05:08

Author: manx
Date: Sun Oct 13 15:04:56 2024
New Revision: 21805
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21805

Log:
[Fix] build: Makefile: DJGPP: Also package DJGPP license files.

Modified:
   trunk/OpenMPT/Makefile

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Fri Oct 11 18:33:31 2024	(r21804)
+++ trunk/OpenMPT/Makefile	Sun Oct 13 15:04:56 2024	(r21805)
@@ -2033,6 +2033,11 @@
 	svn export ./include/miniz/miniz.c                  bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MINIZ.TXT    --native-eol CRLF
 	svn export ./include/stb_vorbis/stb_vorbis.c        bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/STBVORB.TXT  --native-eol CRLF
 endif
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/copying     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/COPYING
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/copying.dj  bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/COPYING.DJ
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/copying.lib bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/COPYING.LIB
+	cp $(shell dirname $(shell which i386-pc-msdosdjgpp-gcc))/../license/source.txt  bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/DJGPP/SOURCE.TXT
 	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/SRC
 	cp build/externals/csdpmi7s.zip                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/SRC/CSDPMI7S.ZIP
 	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/BIN

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

From: <sv...@op...> - 2024-10-11 16:33:43

Author: sagamusix
Date: Fri Oct 11 18:33:31 2024
New Revision: 21804
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21804

Log:
Merged revision(s) 21803 from trunk/OpenMPT:
[Mod] S3M: Only ignore O00 effects if the file has been identified as being made with ST3.00/ST3.01. Several other tools identify as ST3.01 but they probably don't need this quirk (in particular UNMO3).
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_s3m.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_s3m.cpp	Fri Oct 11 18:33:09 2024	(r21803)
+++ branches/OpenMPT-1.31/soundlib/Load_s3m.cpp	Fri Oct 11 18:33:31 2024	(r21804)
@@ -724,7 +724,7 @@
 						else if(m.param > 0x08)
 							zxxCountRight++;
 					}
-				} else if(m.command == CMD_OFFSET && m.param == 0 && fileHeader.cwtv <= S3MFileHeader::trkST3_01)
+				} else if(m.command == CMD_OFFSET && m.param == 0 && isST3 && fileHeader.cwtv <= S3MFileHeader::trkST3_01)
 				{
 					// Offset command didn't have effect memory in ST3.01; fixed in ST3.03
 					m.command = CMD_DUMMY;

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

From: <sv...@op...> - 2024-10-11 16:33:22

Author: sagamusix
Date: Fri Oct 11 18:33:09 2024
New Revision: 21803
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21803

Log:
[Mod] S3M: Only ignore O00 effects if the file has been identified as being made with ST3.00/ST3.01. Several other tools identify as ST3.01 but they probably don't need this quirk (in particular UNMO3).

Modified:
   trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Thu Oct 10 14:08:10 2024	(r21802)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Fri Oct 11 18:33:09 2024	(r21803)
@@ -708,7 +708,7 @@
 						else if(m.param > 0x08)
 							zxxCountRight++;
 					}
-				} else if(m.command == CMD_OFFSET && m.param == 0 && fileHeader.cwtv <= S3MFileHeader::trkST3_01)
+				} else if(m.command == CMD_OFFSET && m.param == 0 && isST3 && fileHeader.cwtv <= S3MFileHeader::trkST3_01)
 				{
 					// Offset command didn't have effect memory in ST3.01; fixed in ST3.03
 					m.command = CMD_DUMMY;

[OMPT-svn-commit] OpenMPT r21802 - in branches/OpenMPT-1.28: . .github/workflows

From: <sv...@op...> - 2024-10-10 12:08:23

Author: manx
Date: Thu Oct 10 14:08:10 2024
New Revision: 21802
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21802

Log:
Merged revision(s) 21801 from branches/OpenMPT-1.29:
Merged revision(s) 21800 from branches/OpenMPT-1.30:
[Mod] build: CI: GitHub: CPA: Run on Ubuntu 24.04. See r21796.
........
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.4-Makefile.yml

Modified: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.4-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.4-Makefile.yml	Thu Oct 10 14:07:38 2024	(r21801)
+++ branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.4-Makefile.yml	Thu Oct 10 14:08:10 2024	(r21802)
@@ -11,7 +11,7 @@
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

[OMPT-svn-commit] OpenMPT r21801 - in branches/OpenMPT-1.29: . .github/workflows

From: <sv...@op...> - 2024-10-10 12:07:50

Author: manx
Date: Thu Oct 10 14:07:38 2024
New Revision: 21801
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21801

Log:
Merged revision(s) 21800 from branches/OpenMPT-1.30:
[Mod] build: CI: GitHub: CPA: Run on Ubuntu 24.04. See r21796.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.4-Makefile.yml

Modified: branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.4-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.4-Makefile.yml	Thu Oct 10 14:06:49 2024	(r21800)
+++ branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.4-Makefile.yml	Thu Oct 10 14:07:38 2024	(r21801)
@@ -11,7 +11,7 @@
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

[OMPT-svn-commit] OpenMPT r21800 - branches/OpenMPT-1.30/.github/workflows

From: <sv...@op...> - 2024-10-10 12:06:56

Author: manx
Date: Thu Oct 10 14:06:49 2024
New Revision: 21800
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21800

Log:
[Mod] build: CI: GitHub: CPA: Run on Ubuntu 24.04. See r21796.

Modified:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.4-Makefile.yml
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml
   branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml
   branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.4-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.4-Makefile.yml	Thu Oct 10 14:05:58 2024	(r21799)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.4-Makefile.yml	Thu Oct 10 14:06:49 2024	(r21800)
@@ -11,7 +11,7 @@
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml	Thu Oct 10 14:05:58 2024	(r21799)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml	Thu Oct 10 14:06:49 2024	(r21800)
@@ -11,7 +11,7 @@
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml	Thu Oct 10 14:05:58 2024	(r21799)
+++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml	Thu Oct 10 14:06:49 2024	(r21800)
@@ -11,7 +11,7 @@
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml	Thu Oct 10 14:05:58 2024	(r21799)
+++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml	Thu Oct 10 14:06:49 2024	(r21800)
@@ -11,7 +11,7 @@
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

[OMPT-svn-commit] OpenMPT r21799 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2024-10-10 12:06:10

Author: manx
Date: Thu Oct 10 14:05:58 2024
New Revision: 21799
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21799

Log:
Merged revision(s) 21794-21796 from trunk/OpenMPT:
[Imp] build: CI: GitHub: Add OpenBSD 7.6.
........
[Imp] build: CI: GitHub: Add OpenBSD 7.6.
........
[Imp] build: CI: GitHub: Add OpenBSD 7.6.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:05:31 2024	(r21798)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:05:58 2024	(r21799)
@@ -11,6 +11,7 @@
       fail-fast: false
       matrix:
         include:
+          - { version: '7.6' }
           - { version: '7.5' }
           - { version: '7.4' }
 
@@ -24,7 +25,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -35,7 +36,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -46,11 +47,11 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -60,9 +61,9 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
+          export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 14:05:31 2024	(r21798)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 14:05:58 2024	(r21799)
@@ -11,6 +11,9 @@
       fail-fast: false
       matrix:
         include:
+          - { version: '7.6', deps: sys   }
+          - { version: '7.6', deps: local }
+          - { version: '7.6', deps: small }
           - { version: '7.5', deps: sys   }
           - { version: '7.5', deps: local }
           - { version: '7.5', deps: small }
@@ -28,7 +31,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -39,7 +42,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -50,11 +53,11 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -66,7 +69,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -78,7 +81,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G

[OMPT-svn-commit] OpenMPT r21798 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2024-10-10 12:05:37

Author: manx
Date: Thu Oct 10 14:05:31 2024
New Revision: 21798
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21798

Log:
Merged revision(s) 21797 from trunk/OpenMPT:
[Mod] build: CI: GitHub: CPA: Run on Ubuntu 24.04.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml	Thu Oct 10 14:05:07 2024	(r21797)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml	Thu Oct 10 14:05:31 2024	(r21798)
@@ -18,7 +18,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Thu Oct 10 14:05:07 2024	(r21797)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Thu Oct 10 14:05:31 2024	(r21798)
@@ -22,7 +22,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml	Thu Oct 10 14:05:07 2024	(r21797)
+++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml	Thu Oct 10 14:05:31 2024	(r21798)
@@ -18,7 +18,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Thu Oct 10 14:05:07 2024	(r21797)
+++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Thu Oct 10 14:05:31 2024	(r21798)
@@ -22,7 +22,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:05:07 2024	(r21797)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:05:31 2024	(r21798)
@@ -18,7 +18,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 14:05:07 2024	(r21797)
+++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 14:05:31 2024	(r21798)
@@ -22,7 +22,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

[OMPT-svn-commit] OpenMPT r21797 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-10-10 12:05:18

Author: manx
Date: Thu Oct 10 14:05:07 2024
New Revision: 21797
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21797

Log:
[Mod] build: CI: GitHub: CPA: Run on Ubuntu 24.04.

Modified:
   trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
   trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml	Thu Oct 10 14:04:32 2024	(r21796)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml	Thu Oct 10 14:05:07 2024	(r21797)
@@ -20,7 +20,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Thu Oct 10 14:04:32 2024	(r21796)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Thu Oct 10 14:05:07 2024	(r21797)
@@ -24,7 +24,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml	Thu Oct 10 14:04:32 2024	(r21796)
+++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml	Thu Oct 10 14:05:07 2024	(r21797)
@@ -20,7 +20,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Thu Oct 10 14:04:32 2024	(r21796)
+++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Thu Oct 10 14:05:07 2024	(r21797)
@@ -24,7 +24,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:04:32 2024	(r21796)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:05:07 2024	(r21797)
@@ -21,7 +21,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 14:04:32 2024	(r21796)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 14:05:07 2024	(r21797)
@@ -27,7 +27,7 @@
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}
       cancel-in-progress: true
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

[OMPT-svn-commit] OpenMPT r21796 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-10-10 12:04:44

Author: manx
Date: Thu Oct 10 14:04:32 2024
New Revision: 21796
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21796

Log:
[Imp] build: CI: GitHub: Add OpenBSD 7.6.

Modified:
   trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 13:01:51 2024	(r21795)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 14:04:32 2024	(r21796)
@@ -63,7 +63,7 @@
         sync_files: false
         shutdown_vm: false
         run: |
-          export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
+          export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
     - name: Shutdown VM
       uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:

[OMPT-svn-commit] OpenMPT r21795 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-10-10 11:02:04

Author: manx
Date: Thu Oct 10 13:01:51 2024
New Revision: 21795
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21795

Log:
[Imp] build: CI: GitHub: Add OpenBSD 7.6.

Modified:
   trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 12:46:31 2024	(r21794)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 13:01:51 2024	(r21795)
@@ -49,8 +49,8 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
       uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 12:46:31 2024	(r21794)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 13:01:51 2024	(r21795)
@@ -55,8 +55,8 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
       uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018

[OMPT-svn-commit] OpenMPT r21794 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-10-10 10:46:38

Author: manx
Date: Thu Oct 10 12:46:31 2024
New Revision: 21794
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21794

Log:
[Imp] build: CI: GitHub: Add OpenBSD 7.6.

Modified:
   trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 09:54:14 2024	(r21793)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml	Thu Oct 10 12:46:31 2024	(r21794)
@@ -13,6 +13,7 @@
       fail-fast: false
       matrix:
         include:
+          - { version: '7.6' }
           - { version: '7.5' }
           - { version: '7.4' }
 
@@ -26,7 +27,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -37,7 +38,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -48,11 +49,11 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -64,7 +65,7 @@
         run: |
           export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G

Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 09:54:14 2024	(r21793)
+++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml	Thu Oct 10 12:46:31 2024	(r21794)
@@ -13,6 +13,9 @@
       fail-fast: false
       matrix:
         include:
+          - { version: '7.6', deps: sys   }
+          - { version: '7.6', deps: local }
+          - { version: '7.6', deps: small }
           - { version: '7.5', deps: sys   }
           - { version: '7.5', deps: local }
           - { version: '7.5', deps: small }
@@ -30,7 +33,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -41,7 +44,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -52,11 +55,11 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
-          sudo pkg_add -I ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || ${{ (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }}
+          sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || ${{ (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }}
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -68,7 +71,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G
@@ -80,7 +83,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.25.0
+      uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
       with:
         architecture: x86_64
         memory: 4G

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

Flat | Threaded

<< < 1 .. 82 83 84 85 86 .. 957 > >> (Page 84 of 957)