Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(202) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-11-28 14:38:48
|
Author: sagamusix Date: Thu Nov 28 15:38:41 2024 New Revision: 22330 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22330 Log: [Fix] When importing a soundfont instrument, its bank number was off by one. Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Dlsbank.cpp Wed Nov 27 23:32:40 2024 (r22329) +++ trunk/OpenMPT/soundlib/Dlsbank.cpp Thu Nov 28 15:38:41 2024 (r22330) @@ -2135,9 +2135,9 @@ } } pIns->nFadeOut = 1024; - pIns->nMidiProgram = (uint8)(dlsIns.ulInstrument & 0x7F) + 1; - pIns->nMidiChannel = (uint8)(isDrum ? 10 : 0); - pIns->wMidiBank = (uint16)(((dlsIns.ulBank & 0x7F00) >> 1) | (dlsIns.ulBank & 0x7F)); + pIns->nMidiProgram = static_cast<uint8>(1 + (dlsIns.ulInstrument & 0x7F)); + pIns->nMidiChannel = static_cast<uint8>(isDrum ? 10 : 0); + pIns->wMidiBank = static_cast<uint16>(1 + (((dlsIns.ulBank & 0x7F00) >> 1) | (dlsIns.ulBank & 0x7F))); pIns->nNNA = NewNoteAction::NoteOff; pIns->nDCT = DuplicateCheckType::Note; pIns->nDNA = DuplicateNoteAction::NoteFade; @@ -2154,7 +2154,7 @@ const DLSREGION &rgn = dlsIns.Regions[nRgn]; if(rgn.IsDummy()) continue; - // Elimitate Duplicate Regions + // Eliminate Duplicate Regions uint32 dupRegion; for(dupRegion = minRegion; dupRegion < nRgn; dupRegion++) { |
|
From: <sv...@op...> - 2024-11-27 22:32:54
|
Author: sagamusix Date: Wed Nov 27 23:32:40 2024 New Revision: 22329 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22329 Log: [Mod] Increase size of settings dialog to allow for new settings to be added (https://bugs.openmpt.org/view.php?id=816). Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp trunk/OpenMPT/mptrack/KeyConfigDlg.cpp trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Wed Nov 27 23:18:46 2024 (r22328) +++ trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp Wed Nov 27 23:32:40 2024 (r22329) @@ -70,20 +70,20 @@ { static constexpr ListCtrl::Header headers[] = { - { _T("Setting"), 150, LVCFMT_LEFT }, + { _T("Setting"), 170, LVCFMT_LEFT }, { _T("Type"), 40, LVCFMT_LEFT }, - { _T("Value"), 140, LVCFMT_LEFT }, - { _T("Default"), 62, LVCFMT_LEFT }, + { _T("Value"), 160, LVCFMT_LEFT }, + { _T("Default"), 76, LVCFMT_LEFT }, }; m_List.SetHeaders(headers); } else { static constexpr ListCtrl::Header headers[] = { - { _T("Setting"), 200, LVCFMT_LEFT }, + { _T("Setting"), 220, LVCFMT_LEFT }, { _T("Type"), 40, LVCFMT_LEFT }, - { _T("Value"), 100, LVCFMT_LEFT }, - { _T("Default"), 52, LVCFMT_LEFT }, + { _T("Value"), 120, LVCFMT_LEFT }, + { _T("Default"), 66, LVCFMT_LEFT }, }; m_List.SetHeaders(headers); } Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Wed Nov 27 23:18:46 2024 (r22328) +++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp Wed Nov 27 23:32:40 2024 (r22329) @@ -127,8 +127,8 @@ static constexpr CListCtrlEx::Header KeyListHeaders[] = { - {_T("Shortcut"), 276, LVCFMT_LEFT}, - {_T("Assigned Keys"), 116, LVCFMT_LEFT}, + {_T("Shortcut"), 274, LVCFMT_LEFT}, + {_T("Assigned Keys"), 174, LVCFMT_LEFT}, }; BEGIN_MESSAGE_MAP(COptionsKeyboard, CPropertyPage) Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Wed Nov 27 23:18:46 2024 (r22328) +++ trunk/OpenMPT/mptrack/mptrack.rc Wed Nov 27 23:32:40 2024 (r22329) @@ -159,12 +159,12 @@ LTEXT "samples",IDC_STATIC,150,45,42,8 END -IDD_OPTIONS_SAMPLEEDITOR DIALOGEX 0, 0, 287, 273 +IDD_OPTIONS_SAMPLEEDITOR DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Samples" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Sample Editor",IDC_STATIC,6,6,276,138 + GROUPBOX "Sample Editor",IDC_STATIC,6,6,312,138 LTEXT "Sample &Undo Buffer:",IDC_STATIC,12,20,102,8 EDITTEXT IDC_EDIT_UNDOSIZE,114,18,42,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,144,24,12,12 @@ -187,11 +187,11 @@ CONTROL "Do not follow Pla&y Cursor",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,144,102,126,12 CONTROL "Follo&w Play Cursor",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,144,114,126,12 CONTROL "Follow Play Cursor c&entered",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,144,126,126,12 - GROUPBOX "Instrument Editor",IDC_STATIC,6,150,276,48 + GROUPBOX "Instrument Editor",IDC_STATIC,6,150,312,48 CONTROL "&Compress ITI Files",IDC_COMPRESS_ITI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,162,264,12 LTEXT "Default &Plugin Volume Command Handling:",IDC_STATIC,12,182,150,8 COMBOBOX IDC_VOLUME_HANDLING,162,180,78,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Common",IDC_STATIC,6,204,276,66 + GROUPBOX "Common",IDC_STATIC,6,204,312,66 CONTROL "Pre&view Samples / Instruments in File Browser",IDC_PREVIEW_SAMPLES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,217,264,12 CONTROL "N&ormalize 24-/32-bit Samples on Load",IDC_NORMALIZE, @@ -243,27 +243,27 @@ CONTROL "&Post-loop fade",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,61,180,12 END -IDD_OPTIONS_UPDATE DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_UPDATE DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Update" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Enable Online &Update Check",IDC_CHECK_UPDATEENABLED, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,6,106,10 - GROUPBOX "Check for Updates",IDC_STATIC_UPDATECHECK,6,24,276,66 + GROUPBOX "Check for Updates",IDC_STATIC_UPDATECHECK,6,24,312,66 CONTROL "&Install Updates automatically",IDC_CHECK_UPDATEINSTALLAUTOMATICALLY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,36,264,12 LTEXT "Automatically check on program &start:",IDC_STATIC_UPDATEFREQUENCY,12,54,132,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_UPDATEFREQUENCY,146,54,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Check now...",IDC_BUTTON1,216,54,60,12 LTEXT "",IDC_LASTUPDATE,12,73,264,12 - GROUPBOX "Privacy Settings",IDC_STATIC_UPDATEPRIVACY,6,96,276,84 + GROUPBOX "Privacy Settings",IDC_STATIC_UPDATEPRIVACY,6,96,312,84 CONTROL "&Allow OpenMPT to collect basic statistics about your system configuration",IDC_CHECK1, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,108,264,12 - LTEXT "",IDC_STATIC_UPDATEPRIVACYTEXT,12,120,264,36 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,108,294,12 + LTEXT "",IDC_STATIC_UPDATEPRIVACYTEXT,12,120,294,36 CONTROL "<a>Show which information would be transmitted to OpenMPT...</a>",IDC_SYSLINK1, - "SysLink",WS_TABSTOP,12,162,264,12 - GROUPBOX "Update Channel",IDC_STATIC_UDATECHANNEL,6,192,276,52 + "SysLink",WS_TABSTOP,12,162,294,12 + GROUPBOX "Update Channel",IDC_STATIC_UDATECHANNEL,6,192,312,52 CONTROL "&Release: Official stable released versions only (recommended)",IDC_RADIO1, "Button",BS_AUTORADIOBUTTON,12,204,264,10 CONTROL "&Next: Previews of the next official stable release",IDC_RADIO2, @@ -350,16 +350,16 @@ PUSHBUTTON "Cancel",IDCANCEL,108,42,50,14 END -IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Advanced" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Warning:\nChanging advanced settings might cause stability problems.\nYou should only continue if you know what you are doing.",IDC_STATIC,6,6,204,24 + LTEXT "Warning:\nChanging advanced settings might cause stability problems.\nYou should only continue if you know what you are doing.",IDC_STATIC,6,6,252,24 LTEXT "&Find:",IDC_STATIC,6,38,17,8 - EDITTEXT IDC_EDIT1,30,36,252,12,ES_AUTOHSCROLL - CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,54,276,222 - PUSHBUTTON "&Save now",IDC_BUTTON1,228,12,50,14 + EDITTEXT IDC_EDIT1,30,36,288,12,ES_AUTOHSCROLL + CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,54,312,252 + PUSHBUTTON "&Save now",IDC_BUTTON1,264,12,50,14 END IDD_SCANPLUGINS DIALOGEX 0, 0, 316, 34 @@ -497,20 +497,20 @@ CONTROL "Send timing messages",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,66,120,12 END -IDD_OPTIONS_WINE DIALOGEX 0, 0, 286, 278 +IDD_OPTIONS_WINE DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wine" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Enable Wine native host support (requires restarting OpenMPT)",IDC_CHECK_WINE_ENABLE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,273,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,6,275,10 LTEXT "P&ortAudio:",IDC_STATIC_WINE_PORTAUDIO,18,42,42,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_WINE_PORTAUDIO,66,42,48,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&PulseAudio:",IDC_STATIC_WINE_PULSEAUDIO,18,24,42,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_WINE_PULSEAUDIO,66,24,48,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&RtAudio:",IDC_STATIC_WINE_RTAUDIO,18,60,42,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_WINE_RTAUDIO,66,60,48,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Support for native host system audio output is EXPERIMENTAL. Consult the OpenMPT manual for more information.",IDC_STATIC,6,84,238,23 + LTEXT "Support for native host system audio output is EXPERIMENTAL. Consult the OpenMPT manual for more information.",IDC_STATIC,6,84,306,23 END IDD_LFOPLUGIN DIALOGEX 0, 0, 303, 201 @@ -712,9 +712,8 @@ IDD_OPTIONS_SAMPLEEDITOR, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 280 + RIGHTMARGIN, 318 TOPMARGIN, 7 - BOTTOMMARGIN, 266 END IDD_EDITHISTORY, DIALOG @@ -744,9 +743,9 @@ IDD_OPTIONS_UPDATE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 318 TOPMARGIN, 7 - BOTTOMMARGIN, 274 + BOTTOMMARGIN, 307 END IDD_CLOSEDOCUMENTS, DIALOG @@ -792,7 +791,7 @@ IDD_OPTIONS_ADVANCED, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 318 TOPMARGIN, 7 BOTTOMMARGIN, 274 END @@ -864,9 +863,9 @@ IDD_OPTIONS_WINE, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 319 TOPMARGIN, 7 - BOTTOMMARGIN, 271 + BOTTOMMARGIN, 304 END IDD_LFOPLUGIN, DIALOG @@ -1112,12 +1111,12 @@ EDITTEXT IDC_EDITABOUT,12,114,318,138,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL END -IDD_OPTIONS_PLAYER DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_PLAYER DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "DSP" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "",IDC_STATIC,6,6,276,150 + GROUPBOX "",IDC_STATIC,6,6,312,150 CONTROL "&Enable Graphic Equalizer",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,6,94,10 LTEXT "+12dB",IDC_STATIC,12,21,22,8 LTEXT "+0dB",IDC_STATIC,16,49,18,8 @@ -1135,38 +1134,38 @@ CTEXT "10kHz",IDC_TEXT6,210,87,22,8 CONTROL "",IDC_SLIDER12,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,206,18,24,68 CTEXT "Right-click on a band to change its center frequency",IDC_STATIC,36,102,200,8 - PUSHBUTTON "User1",IDC_BUTTON1,240,18,36,12 - PUSHBUTTON "User2",IDC_BUTTON2,240,36,36,12 - PUSHBUTTON "User3",IDC_BUTTON3,240,54,36,12 - PUSHBUTTON "User4",IDC_BUTTON4,240,72,36,12 - PUSHBUTTON "&Save...",IDC_BUTTON5,240,90,36,12 - LTEXT "EQ Warning Message",IDC_EQ_WARNING,12,114,264,36,0,WS_EX_TRANSPARENT - GROUPBOX "",IDC_STATIC,6,156,276,120 - CONTROL "&Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,164,97,10 - CONTROL "&Bit Crush",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,164,48,10 - CONTROL "",IDC_SLIDER4,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS | WS_TABSTOP,162,162,62,15 - CONTROL "&Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,178,81,10 - CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,191,62,15 - LTEXT "Low",IDC_STATIC,17,193,14,8 - LTEXT "High",IDC_STATIC,95,193,16,8 - LTEXT "Range:",IDC_STATIC,169,178,24,8 - CONTROL "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,149,190,62,15 - LTEXT "10Hz",IDC_STATIC,131,193,18,8 - LTEXT "100Hz",IDC_STATIC,211,191,23,8 - CONTROL "&Reverb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,210,62,10 - CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,222,62,15 - LTEXT "Low",IDC_STATIC,17,226,14,8 - LTEXT "High",IDC_STATIC,95,226,16,8 - CTEXT "Reverb Preset:",IDC_STATIC,150,210,62,8 - COMBOBOX IDC_COMBO2,135,223,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "&Pro-Logic Surround",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,242,99,10 - CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,255,62,15 - LTEXT "Low",IDC_STATIC,17,258,14,8 - LTEXT "High",IDC_STATIC,95,258,16,8 - CTEXT "Front/Rear Delay:",IDC_STATIC,147,244,65,8 - CONTROL "Slider2",IDC_SLIDER6,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,149,254,62,15 - LTEXT "5ms",IDC_STATIC,131,257,18,8 - LTEXT "50ms",IDC_STATIC,211,257,23,8 + PUSHBUTTON "User1",IDC_BUTTON1,258,18,54,12 + PUSHBUTTON "User2",IDC_BUTTON2,258,36,54,12 + PUSHBUTTON "User3",IDC_BUTTON3,258,54,54,12 + PUSHBUTTON "User4",IDC_BUTTON4,258,72,54,12 + PUSHBUTTON "&Save...",IDC_BUTTON5,258,90,54,12 + LTEXT "EQ Warning Message",IDC_EQ_WARNING,12,114,300,36,0,WS_EX_TRANSPARENT + GROUPBOX "",IDC_STATIC,6,162,312,144 + CONTROL "&Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,171,97,10 + CONTROL "&Bit Crush",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,171,48,10 + CONTROL "",IDC_SLIDER4,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS | WS_TABSTOP,192,168,62,15 + CONTROL "&Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,192,81,10 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,206,62,15 + LTEXT "Low",IDC_STATIC,14,208,14,8 + LTEXT "High",IDC_STATIC,92,208,16,8 + LTEXT "Range:",IDC_STATIC,181,192,24,8 + CONTROL "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,161,206,62,15 + LTEXT "10Hz",IDC_STATIC,143,208,18,8 + LTEXT "100Hz",IDC_STATIC,223,206,23,8 + CONTROL "&Reverb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,228,62,10 + CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,242,62,15 + LTEXT "Low",IDC_STATIC,14,244,14,8 + LTEXT "High",IDC_STATIC,92,244,16,8 + CTEXT "Reverb Preset:",IDC_STATIC,162,228,62,8 + COMBOBOX IDC_COMBO2,147,241,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "&Pro-Logic Surround",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,264,99,10 + CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,30,278,62,15 + LTEXT "Low",IDC_STATIC,14,280,14,8 + LTEXT "High",IDC_STATIC,92,280,16,8 + CTEXT "Front/Rear Delay:",IDC_STATIC,159,267,65,8 + CONTROL "Slider2",IDC_SLIDER6,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,161,278,62,15 + LTEXT "5ms",IDC_STATIC,143,280,18,8 + LTEXT "50ms",IDC_STATIC,223,280,23,8 END IDD_WAVECONVERT DIALOGEX 0, 0, 389, 284 @@ -1244,51 +1243,51 @@ CTEXT "Writing file...",IDC_TEXT1,4,4,212,9 END -IDD_OPTIONS_KEYBOARD DIALOGEX 0, 0, 286, 282 +IDD_OPTIONS_KEYBOARD DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Keyboard" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Select c&ategory:",IDC_STATIC,7,8,83,8 - COMBOBOX IDC_KEYCATEGORY,90,6,192,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COMMAND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,24,277,126 - LTEXT "&Find by Name:",IDC_STATIC,6,158,54,8 - EDITTEXT IDC_FIND,60,156,102,12,ES_AUTOHSCROLL - PUSHBUTTON "Find by Hotkey...",IDC_BUTTON2,168,156,66,13 - LTEXT "Key:",IDC_FINDHOTKEY_LABEL,174,158,17,8,NOT WS_VISIBLE - EDITTEXT IDC_FINDHOTKEY,192,156,42,12,ES_AUTOHSCROLL | NOT WS_VISIBLE - PUSHBUTTON "C&lear",IDC_BUTTON3,240,156,44,12 - GROUPBOX "&Key setup for selected command",IDC_GROUPBOX_KEYSETUP,6,174,276,66 - COMBOBOX IDC_CHOICECOMBO,12,186,84,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Key:",IDC_STATIC,102,188,16,8 - EDITTEXT IDC_CUSTHOTKEY,120,186,72,13,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Set",IDC_BUTTON1,198,186,37,13 - PUSHBUTTON "&Restore",IDC_RESTORE,240,186,37,13 - PUSHBUTTON "&Delete Choice",IDC_DELETE,198,204,79,13 - CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,206,66,8 - CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,206,60,8 - CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,206,54,8 - ICON "",IDC_STATIC1,12,223,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE - LTEXT "No conflicts found.",IDC_KEYREPORT,26,224,254,13 - CONTROL "Repeat Note Keys on Hold",IDC_NOTESREPEAT,"Button",BS_3STATE | WS_TABSTOP,6,246,144,12 - LTEXT "Chord detect interval (ms):",IDC_STATIC,156,248,94,8 - EDITTEXT IDC_CHORDDETECTWAITTIME,252,246,30,12,ES_AUTOHSCROLL | ES_NUMBER - PUSHBUTTON "&Import Key Map...",IDC_LOAD,6,264,72,13 - PUSHBUTTON "&Export Key Map...",IDC_SAVE,84,264,72,13 - PUSHBUTTON "Restore default &configuration",IDC_RESTORE_KEYMAP,162,264,120,12 + COMBOBOX IDC_KEYCATEGORY,90,6,228,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COMMAND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,24,313,150 + LTEXT "&Find by Name:",IDC_STATIC,6,182,54,8 + EDITTEXT IDC_FIND,60,180,138,12,ES_AUTOHSCROLL + PUSHBUTTON "Find by Hotkey...",IDC_BUTTON2,204,180,66,13 + LTEXT "Key:",IDC_FINDHOTKEY_LABEL,210,182,17,8,NOT WS_VISIBLE + EDITTEXT IDC_FINDHOTKEY,228,180,42,12,ES_AUTOHSCROLL | NOT WS_VISIBLE + PUSHBUTTON "C&lear",IDC_BUTTON3,276,180,44,12 + GROUPBOX "&Key setup for selected command",IDC_GROUPBOX_KEYSETUP,6,198,312,66 + COMBOBOX IDC_CHOICECOMBO,12,210,84,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Key:",IDC_STATIC,102,212,16,8 + EDITTEXT IDC_CUSTHOTKEY,120,210,72,13,ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Set",IDC_BUTTON1,198,210,37,13 + PUSHBUTTON "&Restore",IDC_RESTORE,240,210,37,13 + PUSHBUTTON "&Delete Choice",IDC_DELETE,198,228,79,13 + CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,230,66,8 + CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,230,60,8 + CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,230,54,8 + ICON "",IDC_STATIC1,12,247,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE + LTEXT "No conflicts found.",IDC_KEYREPORT,26,248,286,13 + CONTROL "Repeat Note Keys on Hold",IDC_NOTESREPEAT,"Button",BS_3STATE | WS_TABSTOP,6,270,144,12 + LTEXT "Chord detect interval (ms):",IDC_STATIC,156,272,126,8 + EDITTEXT IDC_CHORDDETECTWAITTIME,288,270,30,12,ES_AUTOHSCROLL | ES_NUMBER + PUSHBUTTON "&Import Key Map...",IDC_LOAD,6,288,84,16 + PUSHBUTTON "&Export Key Map...",IDC_SAVE,96,288,84,16 + PUSHBUTTON "Restore default &configuration",IDC_RESTORE_KEYMAP,186,288,132,16 END -IDD_OPTIONS_COLORS DIALOGEX 0, 0, 286, 282 +IDD_OPTIONS_COLORS DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Display" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "",IDC_STATIC,6,6,276,162 + GROUPBOX "",IDC_STATIC,6,6,312,192 LTEXT "Pattern &Font:",IDC_STATIC,18,20,54,8 - COMBOBOX IDC_COMBO2,72,18,144,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Custom...",IDC_BUTTON9,222,18,50,12 + COMBOBOX IDC_COMBO2,72,18,180,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Custom...",IDC_BUTTON9,258,18,50,12 LTEXT "Comments f&ont:",IDC_STATIC,18,38,52,8 - PUSHBUTTON "Font",IDC_BUTTON10,72,36,144,12 + PUSHBUTTON "Font",IDC_BUTTON10,72,36,180,12 LTEXT "Display accidentals as:",IDC_STATIC,18,53,78,12,SS_CENTERIMAGE CONTROL "&Sharps (#)",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,102,54,66,12 CONTROL "Flats (&b)",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,168,54,108,12 @@ -1307,32 +1306,32 @@ EDITTEXT IDC_SECONDARYHILITE,102,137,24,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Rows per beat (default)",IDC_STATIC,132,140,144,8 LTEXT "Note: Songs' time signatures will override the default highlight values",IDC_STATIC,18,153,258,8 - GROUPBOX "Colours",IDC_STATIC,6,174,276,105 - LTEXT "Select colo&ur for:",IDC_STATIC,18,188,63,8 - CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,84,186,11,12 - COMBOBOX IDC_COMBO1,96,186,114,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,18,204,120,48 - LTEXT "C1",IDC_TEXT1,144,207,72,8 - CONTROL "Change &1",IDC_BUTTON1,"Button",BS_OWNERDRAW,216,204,51,12 - LTEXT "C2",IDC_TEXT2,144,224,72,8 - CONTROL "Change &2",IDC_BUTTON2,"Button",BS_OWNERDRAW,216,223,51,12 - LTEXT "C3",IDC_TEXT3,144,242,72,8 - CONTROL "Change &3",IDC_BUTTON3,"Button",BS_OWNERDRAW,216,240,51,12 - LTEXT "Presets:",IDC_STATIC,18,261,36,8 - PUSHBUTTON "&Load...",IDC_LOAD_COLORSCHEME,54,258,42,15 - PUSHBUTTON "S&ave...",IDC_SAVE_COLORSCHEME,102,258,42,15 - COMBOBOX IDC_COMBO3,150,259,126,203,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Colours",IDC_STATIC,6,204,312,102 + LTEXT "Select colo&ur for:",IDC_STATIC,18,218,63,8 + CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,84,216,11,12 + COMBOBOX IDC_COMBO1,96,216,156,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,18,234,120,48 + LTEXT "C1",IDC_TEXT1,144,237,108,8 + CONTROL "Change &1",IDC_BUTTON1,"Button",BS_OWNERDRAW,258,234,51,12 + LTEXT "C2",IDC_TEXT2,144,254,108,8 + CONTROL "Change &2",IDC_BUTTON2,"Button",BS_OWNERDRAW,258,252,51,12 + LTEXT "C3",IDC_TEXT3,144,272,108,8 + CONTROL "Change &3",IDC_BUTTON3,"Button",BS_OWNERDRAW,258,270,51,12 + LTEXT "Presets:",IDC_STATIC,18,291,36,8 + PUSHBUTTON "&Load...",IDC_LOAD_COLORSCHEME,54,288,42,15 + PUSHBUTTON "S&ave...",IDC_SAVE_COLORSCHEME,102,288,42,15 + COMBOBOX IDC_COMBO3,150,289,156,203,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_OPTIONS_MIDI DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_MIDI DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "MIDI" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "MIDI Recording",IDC_STATIC,6,6,276,108 + GROUPBOX "MIDI Recording",IDC_STATIC,6,6,312,108 LTEXT "MIDI &Input Device:",IDC_STATIC,18,18,67,8 - COMBOBOX IDC_COMBO1,18,30,198,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Re&name",IDC_BUTTON1,222,30,50,14 + COMBOBOX IDC_COMBO1,18,30,234,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Re&name",IDC_BUTTON1,258,30,50,14 CONTROL "&Apply Octave Transpose to incoming MIDI Notes",IDC_CHECK4, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,48,237,12 CONTROL "&Respond to Play / Continue / Stop Song messages",IDC_MIDIPLAYCONTROL, @@ -1343,7 +1342,7 @@ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,84,237,12 CONTROL "&Enable MIDI recording when launching OpenMPT",IDC_CHECK3, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,97,240,12 - GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,276,114 + GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,312,114 CONTROL "Record Note &Off",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,138,237,8 CONTROL "Record MIDI Note &Velocity, amplify by",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,150,144,8 @@ -1360,7 +1359,7 @@ EDITTEXT IDC_EDIT4,138,198,132,12,ES_AUTOHSCROLL LTEXT "Record A&ftertouch Messages",IDC_STATIC,30,216,108,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO2,138,216,132,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "MIDI File Import",IDC_STATIC,6,240,276,36 + GROUPBOX "MIDI File Import",IDC_STATIC,6,240,312,36 LTEXT "&Quantize:",IDC_STATIC,12,258,32,8 COMBOBOX IDC_COMBO3,48,256,60,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Tic&ks / Row:",IDC_STATIC,114,258,42,8 @@ -1929,65 +1928,65 @@ EDITTEXT IDC_EDIT1,6,6,260,143,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP,WS_EX_STATICEDGE END -IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Default &Artist Name:",IDC_STATIC,12,20,78,8 - EDITTEXT IDC_EDIT1,90,18,186,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT1,90,18,222,12,ES_AUTOHSCROLL LTEXT "Newly created files default to:",IDC_STATIC,12,36,264,12 CONTROL "&Fixed format:",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,49,59,10 COMBOBOX IDC_COMBO1,90,48,84,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Same format as currently open file",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,12,66,264,10 CONTROL "Fixed &template:",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,12,85,66,10 COMBOBOX IDC_COMBO2,90,84,168,12,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_BUTTON1,264,84,12,11 - LISTBOX IDC_LIST1,9,126,147,144,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Description",IDC_TEXT1,162,126,111,138 - GROUPBOX "Miscellaneous Options",IDC_STATIC,4,114,278,162 - GROUPBOX "Defaults",IDC_STATIC,6,6,276,96 + PUSHBUTTON "Browse...",IDC_BUTTON1,264,84,48,12 + LISTBOX IDC_LIST1,9,126,159,180,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LTEXT "Description",IDC_TEXT1,180,126,129,180 + GROUPBOX "Miscellaneous Options",IDC_STATIC,4,114,314,198 + GROUPBOX "Defaults",IDC_STATIC,6,6,312,96 END -IDD_OPTIONS_SOUNDCARD DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_SOUNDCARD DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sound Card" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "&Device",IDC_STATIC,6,6,276,156 - CONTROL "",IDC_COMBO1,"ComboBoxEx32",CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP,12,18,264,96 + GROUPBOX "&Device",IDC_STATIC,6,6,312,156 + CONTROL "",IDC_COMBO1,"ComboBoxEx32",CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP,12,18,300,96 PUSHBUTTON "&Setup device ...",IDC_BUTTON2,24,36,72,12 CONTROL "Show deprecated devices",IDC_CHECK_SOUNDCARD_SHOWALL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,36,96,12 - PUSHBUTTON "&Rescan device list",IDC_BUTTON1,204,36,72,12 + PUSHBUTTON "&Rescan device list",IDC_BUTTON1,240,36,72,12 LTEXT "&Latency:",IDC_STATIC_LATENCY,12,54,30,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO2,48,54,54,83,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "&Period:",IDC_STATIC_UPDATEINTERVAL,12,72,30,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_UPDATEINTERVAL,48,72,54,83,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "&Format:",IDC_STATIC_FORMAT,12,90,30,12,SS_CENTERIMAGE - COMBOBOX IDC_COMBO3,48,90,54,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO5,108,90,42,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO6,156,90,54,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO10,216,90,60,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO3,48,90,60,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO5,114,90,48,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO6,168,90,66,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO10,240,90,72,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Use device &exclusively",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,54,90,12 CONTROL "&Boost thread priority",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,72,90,12 CONTROL "&Hardware timing",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,72,72,12 LTEXT "&Mapping:",IDC_STATIC_CHANNELMAPPING,12,108,30,12,SS_CENTERIMAGE CTEXT "Front",IDC_STATIC_CHANNEL_FRONT,48,108,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - COMBOBOX IDC_COMBO_CHANNEL_FRONTLEFT,78,108,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_CHANNEL_FRONTRIGHT,180,108,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_FRONTLEFT,78,108,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_FRONTRIGHT,198,108,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CTEXT "Rear",IDC_STATIC_CHANNEL_REAR,48,126,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE - COMBOBOX IDC_COMBO_CHANNEL_REARLEFT,78,126,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_CHANNEL_REARRIGHT,180,126,96,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_REARLEFT,78,126,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_CHANNEL_REARRIGHT,198,126,114,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Record:",IDC_STATIC_RECORDING,12,144,36,12,SS_CENTERIMAGE - COMBOBOX IDC_COMBO_RECORDING_CHANNELS,48,144,42,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_RECORDING_SOURCE,96,144,180,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "General",IDC_STATIC,6,186,276,30 + COMBOBOX IDC_COMBO_RECORDING_CHANNELS,48,144,66,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_RECORDING_SOURCE,120,144,192,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "General",IDC_STATIC,6,186,312,30 LTEXT "&When playback is stopped:",IDC_STATIC,12,198,90,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO11,108,198,60,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Open device at startup",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,198,90,12 - GROUPBOX "Stat&istics",IDC_STATIC,6,222,276,55 - EDITTEXT IDC_EDIT_STATISTICS,12,233,264,38,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP + GROUPBOX "Stat&istics",IDC_STATIC,6,222,312,84 + EDITTEXT IDC_EDIT_STATISTICS,12,233,300,67,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP END IDD_MIDIMACRO DIALOGEX 0, 0, 369, 335 @@ -2184,26 +2183,26 @@ GROUPBOX "Length in Rows at Middle-C",IDC_STATIC,6,55,171,45 END -IDD_OPTIONS_AUTOSAVE DIALOGEX 0, 0, 286, 279 +IDD_OPTIONS_AUTOSAVE DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paths / Auto Save" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN RTEXT "Songs:",IDC_STATIC_MODDIR,12,18,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_MODS,66,18,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_MODDIR,264,18,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_MODDIR,264,18,48,11 RTEXT "Samples:",IDC_STATIC_SAMPDIR,12,36,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_SAMPS,66,36,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_SAMPDIR,264,36,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_SAMPDIR,264,36,48,11 RTEXT "Instruments:",IDC_STATIC_INSTRDIR,12,54,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_INSTS,66,54,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_INSTRDIR,264,54,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_INSTRDIR,264,54,48,11 RTEXT "VST Plugins:",IDC_STATIC_VSTDIR,12,72,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_VSTS,66,72,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTDIR,264,72,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_VSTDIR,264,72,48,11 RTEXT "VST Presets:",IDC_STATIC_VSTPRESETDIR,12,90,48,12,SS_CENTERIMAGE EDITTEXT IDC_OPTIONS_DIR_VSTPRESETS,66,90,192,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,264,90,12,11 + PUSHBUTTON "Browse...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,264,90,48,11 CONTROL "Create &backup copy (*.bak) when saving module files",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,135,258,12 CONTROL "&Enable Auto Save",IDC_AUTOSAVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,154,237,10 @@ -2219,12 +2218,12 @@ "Button",BS_AUTORADIOBUTTON,18,202,218,10 CONTROL "S&tore in:",IDC_AUTOSAVE_USECUSTOMDIR,"Button",BS_AUTORADIOBUTTON,18,218,43,10 EDITTEXT IDC_AUTOSAVE_PATH,72,216,186,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_AUTOSAVE_BROWSE,264,216,12,11 + PUSHBUTTON "Browse...",IDC_AUTOSAVE_BROWSE,264,216,48,11 LTEXT "Filename:",IDC_STATIC,30,240,36,12,SS_CENTERIMAGE - LTEXT "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,72,240,186,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE - LTEXT "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,72,258,186,12,SS_CENTERIMAGE - GROUPBOX "Backup and Auto Save",IDC_STATIC,6,120,278,157 - GROUPBOX "Default Directories",IDC_STATIC,6,6,276,102 + LTEXT "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,72,240,240,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE + LTEXT "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,72,258,240,12,SS_CENTERIMAGE + GROUPBOX "Backup and Auto Save",IDC_STATIC,6,120,312,186 + GROUPBOX "Default Directories",IDC_STATIC,6,6,312,102 END IDD_EDIT_GOTO DIALOGEX 0, 0, 123, 122 @@ -2272,18 +2271,18 @@ PUSHBUTTON "&Cancel",IDCANCEL,138,30,50,14 END -IDD_OPTIONS_MIXER DIALOGEX 0, 0, 286, 281 +IDD_OPTIONS_MIXER DIALOGEX 0, 0, 327, 314 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mixer" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - GROUPBOX "Resampling",IDC_STATIC,6,6,276,48 + GROUPBOX "Resampling",IDC_STATIC,6,6,312,48 LTEXT "&Filter:",IDC_STATIC,12,18,24,12,SS_CENTERIMAGE COMBOBOX IDC_COMBO_FILTER,36,18,102,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Use &Amiga resampler for Amiga modules",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,36,144,12 COMBOBOX IDC_COMBO_AMIGA_TYPE,162,36,102,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,72 + GROUPBOX "Volume Ramping",IDC_STATIC,6,60,312,72 EDITTEXT IDC_RAMPING_IN,12,72,36,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,42,66,11,14 LTEXT "s &up",IDC_STATIC,54,72,22,12,SS_CENTERIMAGE @@ -2293,15 +2292,15 @@ LTEXT "s &down",IDC_STATIC,54,92,28,11,SS_CENTERIMAGE EDITTEXT IDC_EDIT_VOLRAMP_SAMPLES_DOWN,90,90,90,12,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Reset to Defaults",IDC_BUTTON1,12,110,72,14 - GROUPBOX "Behaviour",IDC_STATIC,6,150,276,30 - LTEXT "&Stereo Separation:",IDC_STATIC,12,162,72,8 - CONTROL "",IDC_SLIDER_STEREOSEP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,86,162,54,12 - LTEXT "100%",IDC_TEXT_STEREOSEP,140,162,36,8 - GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,276,72 + GROUPBOX "Behaviour",IDC_STATIC,6,144,312,30 + LTEXT "&Stereo Separation:",IDC_STATIC,12,156,72,8 + CONTROL "",IDC_SLIDER_STEREOSEP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,86,156,54,12 + LTEXT "100%",IDC_TEXT_STEREOSEP,140,156,36,8 + GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,312,72 CONTROL "Soft &Panning",IDC_CHECK_SOFTPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,204,66,12 LTEXT "Sample Pre-A&mp:",IDC_STATIC,102,204,60,12,SS_CENTERIMAGE CONTROL "",IDC_SLIDER_PREAMP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,168,198,96,24 - LTEXT "Warning: Only samples are affected by these settings! Modifying them will change the balance between samples and plugins in songs with mix levels set to 1.17RC2 or earlier in the Song Properties! ",IDC_STATIC,12,222,252,30 + LTEXT "Warning: Only samples are affected by these settings! Modifying them will change the balance between samples and plugins in songs with mix levels set to 1.17RC2 or earlier in the Song Properties! ",IDC_STATIC,12,222,300,30 END IDD_QUICKSTART DIALOGEX 0, 0, 332, 211 @@ -2335,11 +2334,10 @@ IDD_OPTIONS_PLAYER, DIALOG BEGIN - RIGHTMARGIN, 280 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 VERTGUIDE, 50 VERTGUIDE, 169 - VERTGUIDE, 256 - BOTTOMMARGIN, 280 END IDD_WAVECONVERT, DIALOG @@ -2355,21 +2353,23 @@ IDD_OPTIONS_KEYBOARD, DIALOG BEGIN - RIGHTMARGIN, 280 + LEFTMARGIN, 5 + RIGHTMARGIN, 320 TOPMARGIN, 5 - BOTTOMMARGIN, 278 END IDD_OPTIONS_COLORS, DIALOG BEGIN - RIGHTMARGIN, 261 - BOTTOMMARGIN, 202 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 + TOPMARGIN, 6 END IDD_OPTIONS_MIDI, DIALOG BEGIN - RIGHTMARGIN, 254 - BOTTOMMARGIN, 278 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 + TOPMARGIN, 6 END IDD_LOADRAWSAMPLE, DIALOG @@ -2472,14 +2472,18 @@ IDD_OPTIONS_GENERAL, DIALOG BEGIN - RIGHTMARGIN, 280 - BOTTOMMARGIN, 278 + LEFTMARGIN, 4 + RIGHTMARGIN, 318 + TOPMARGIN, 6 + BOTTOMMARGIN, 313 END IDD_OPTIONS_SOUNDCARD, DIALOG BEGIN - RIGHTMARGIN, 264 - BOTTOMMARGIN, 178 + LEFTMARGIN, 6 + RIGHTMARGIN, 318 + TOPMARGIN, 6 + BOTTOMMARGIN, 306 END IDD_MIDIMACRO, DIALOG @@ -2554,8 +2558,10 @@ IDD_OPTIONS_AUTOSAVE, DIALOG BEGIN - RIGHTMARGIN, 280 - BOTTOMMARGIN, 276 + LEFTMARGIN, 6 + RIGHTMARGIN, 319 + TOPMARGIN, 6 + BOTTOMMARGIN, 306 END IDD_EDIT_GOTO, DIALOG @@ -2577,9 +2583,8 @@ IDD_OPTIONS_MIXER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 279 + RIGHTMARGIN, 318 TOPMARGIN, 7 - BOTTOMMARGIN, 274 END IDD_QUICKSTART, DIALOG @@ -2757,6 +2762,26 @@ 100, 100, 0, 0 END +IDD_OPTIONS_SOUNDCARD AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_AUTOSAVE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_GENERAL AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_PLAYER AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// |
|
From: <sv...@op...> - 2024-11-27 22:18:54
|
Author: sagamusix Date: Wed Nov 27 23:18:46 2024 New Revision: 22328 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22328 Log: [Imp] Enable the "hide volume column for MOD" feature for other imported formats that don't have a volume column, and it is also not used for importing other effects. Modified: trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/soundlib/Load_fmt.cpp trunk/OpenMPT/soundlib/Load_ftm.cpp trunk/OpenMPT/soundlib/Load_gmc.cpp trunk/OpenMPT/soundlib/Load_ice.cpp trunk/OpenMPT/soundlib/Load_ims.cpp trunk/OpenMPT/soundlib/Load_kris.cpp trunk/OpenMPT/soundlib/Load_mo3.cpp trunk/OpenMPT/soundlib/Load_mod.cpp trunk/OpenMPT/soundlib/Load_mus_km.cpp trunk/OpenMPT/soundlib/Load_stk.cpp trunk/OpenMPT/soundlib/Load_unic.cpp trunk/OpenMPT/soundlib/Snd_defs.h trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/mod_specifications.cpp Modified: trunk/OpenMPT/mptrack/View_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/mptrack/View_pat.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -198,7 +198,7 @@ m_visibleColumns.set(); CModDoc *modDoc = GetDocument(); - if(modDoc->GetModType() == MOD_TYPE_MOD && !modDoc->GetSoundFile().m_SongFlags[SONG_IMPORTED] && TrackerSettings::Instance().autoHideVolumeColumnForMOD) + if(modDoc->GetSoundFile().m_SongFlags[SONG_FORMAT_NO_VOLCOL] && TrackerSettings::Instance().autoHideVolumeColumnForMOD) m_visibleColumns.reset(PatternCursor::volumeColumn); } Modified: trunk/OpenMPT/soundlib/Load_fmt.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_fmt.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_fmt.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -89,7 +89,7 @@ m_nSamples = 8; Order().SetDefaultTempo(TEMPO(45.5)); // 18.2 Hz timer m_playBehaviour.set(kOPLNoteStopWith0Hz); - m_SongFlags.set(SONG_IMPORTED); + m_SongFlags.set(SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songName); for(CHANNELINDEX chn = 0; chn < 8; chn++) Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ftm.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_ftm.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -108,7 +108,7 @@ ChnSettings[chn].nPan = (chn < 2 || chn > 5) ? 64 : 192; ChnSettings[chn].dwFlags.set(CHN_MUTE, !(fileHeader.muteStatus & (1 << chn))); } - m_SongFlags.set(SONG_LINEARSLIDES | SONG_ISAMIGA | SONG_IMPORTED); + m_SongFlags.set(SONG_LINEARSLIDES | SONG_ISAMIGA | SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); m_playBehaviour.set(kContinueSampleWithoutInstr); m_playBehaviour.set(kST3NoMutedChannels); m_playBehaviour.set(kApplyUpperPeriodLimit); Modified: trunk/OpenMPT/soundlib/Load_gmc.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_gmc.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_gmc.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -115,7 +115,7 @@ m_nMinPeriod = 113 * 4; m_nMaxPeriod = 856 * 4; m_nSamplePreAmp = 64; - m_SongFlags.set(SONG_FASTPORTAS); + m_SongFlags.set(SONG_FASTPORTAS | SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); Order().SetDefaultTempoInt(125); Order().SetDefaultSpeed(6); Modified: trunk/OpenMPT/soundlib/Load_ice.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ice.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_ice.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -118,7 +118,7 @@ m_nMinPeriod = 14 * 4; m_nMaxPeriod = 3424 * 4; m_nSamplePreAmp = 64; - m_SongFlags.set(SONG_PT_MODE | SONG_IMPORTED); + m_SongFlags.set(SONG_PT_MODE | SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); m_playBehaviour.reset(kMODOneShotLoops); m_playBehaviour.set(kMODIgnorePanning); m_playBehaviour.set(kMODSampleSwap); // untested Modified: trunk/OpenMPT/soundlib/Load_ims.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ims.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_ims.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -90,7 +90,7 @@ return true; InitializeGlobals(MOD_TYPE_MOD, 4); - m_SongFlags.set(SONG_IMPORTED); + m_SongFlags.set(SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); Order().SetDefaultTempoInt(125); Order().SetDefaultSpeed(6); Order().SetRestartPos(fileHeader.order.restartPos); Modified: trunk/OpenMPT/soundlib/Load_kris.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_kris.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_kris.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -98,7 +98,7 @@ m_nMinPeriod = 113 * 4; m_nMaxPeriod = 856 * 4; m_nSamplePreAmp = 64; - m_SongFlags.set(SONG_PT_MODE | SONG_IMPORTED); + m_SongFlags.set(SONG_PT_MODE | SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); m_playBehaviour.set(kMODIgnorePanning); m_playBehaviour.set(kMODSampleSwap); Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mo3.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_mo3.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -926,6 +926,8 @@ m_nDefaultGlobalVolume = std::min(fileHeader.globalVol.get(), uint8(128)) * 2; else if(m_nType == MOD_TYPE_S3M) m_nDefaultGlobalVolume = std::min(fileHeader.globalVol.get(), uint8(64)) * 4; + else if(m_nType == MOD_TYPE_MOD) + m_SongFlags.set(SONG_FORMAT_NO_VOLCOL); if(fileHeader.sampleVolume < 0) m_nSamplePreAmp = fileHeader.sampleVolume + 52; Modified: trunk/OpenMPT/soundlib/Load_mod.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mod.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_mod.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -298,6 +298,7 @@ } InitializeGlobals(MOD_TYPE_MOD, modMagicResult.numChannels); + m_SongFlags.set(SONG_FORMAT_NO_VOLCOL); bool isNoiseTracker = modMagicResult.isNoiseTracker; bool isStartrekker = modMagicResult.isStartrekker; Modified: trunk/OpenMPT/soundlib/Load_mus_km.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mus_km.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_mus_km.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -170,7 +170,7 @@ return false; InitializeGlobals(MOD_TYPE_MOD, 4); - m_SongFlags = SONG_AMIGALIMITS | SONG_IMPORTED | SONG_ISAMIGA; // Yes, those were not Amiga games but the format fully conforms to Amiga limits, so allow the Amiga Resampler to be used. + m_SongFlags = SONG_AMIGALIMITS | SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL | SONG_ISAMIGA; // Yes, those were not Amiga games but the format fully conforms to Amiga limits, so allow the Amiga Resampler to be used. m_nSamples = 0; static constexpr uint16 MUS_SAMPLE_UNUSED = 255; // Sentinel value to check if a sample needs to be duplicated Modified: trunk/OpenMPT/soundlib/Load_stk.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_stk.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_stk.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -227,7 +227,7 @@ m_nMinPeriod = 113 * 4; m_nMaxPeriod = 856 * 4; m_nSamplePreAmp = 64; - m_SongFlags.set(SONG_PT_MODE | SONG_AUTO_VOLSLIDE_STK); + m_SongFlags.set(SONG_PT_MODE | SONG_FORMAT_NO_VOLCOL | SONG_AUTO_VOLSLIDE_STK); m_songName = mpt::String::ReadBuf(mpt::String::spacePadded, fileHeaders.songname); // Setup channel pan positions and volume Modified: trunk/OpenMPT/soundlib/Load_unic.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_unic.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Load_unic.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -237,7 +237,7 @@ m_nMinPeriod = 113 * 4; m_nMaxPeriod = 856 * 4; m_nSamplePreAmp = 64; - m_SongFlags.set(SONG_PT_MODE | SONG_IMPORTED); + m_SongFlags.set(SONG_PT_MODE | SONG_IMPORTED | SONG_FORMAT_NO_VOLCOL); m_playBehaviour.reset(kMODOneShotLoops); m_playBehaviour.set(kMODIgnorePanning); m_playBehaviour.set(kMODSampleSwap); // untested Modified: trunk/OpenMPT/soundlib/Snd_defs.h ============================================================================== --- trunk/OpenMPT/soundlib/Snd_defs.h Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Snd_defs.h Wed Nov 27 23:18:46 2024 (r22328) @@ -305,6 +305,7 @@ SONG_AUTO_VIBRATO = 0x8000, // Vibrato command is continued automatically SONG_AUTO_TREMOLO = 0x1'8000, // Tremolo command is continued automatically SONG_AUTO_VOLSLIDE_STK = 0x2'0000, // Automatic volume slide command is interpreted like in STK files (rather than like in STP files) + SONG_FORMAT_NO_VOLCOL = 0x4'0000, // The original (imported) format has no volume column, so it can be hidden in the pattern editor. }; DECLARE_FLAGSET(SongFlags) Modified: trunk/OpenMPT/soundlib/Sndfile.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/Sndfile.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -225,9 +225,9 @@ // Note: we do not use the Amiga resampler for DBM as it's a multichannel format and can make use of higher-quality Amiga soundcards instead of Paula. if(GetType() & (/*MOD_TYPE_DBM | */MOD_TYPE_DIGI | MOD_TYPE_MED | MOD_TYPE_MOD | MOD_TYPE_OKT | MOD_TYPE_SFX | MOD_TYPE_STP)) - { m_SongFlags.set(SONG_ISAMIGA); - } + if(GetType() & (MOD_TYPE_AMF0 | MOD_TYPE_DIGI | MOD_TYPE_MTM)) + m_SongFlags.set(SONG_FORMAT_NO_VOLCOL); ChnSettings.assign(numChannels, {}); } Modified: trunk/OpenMPT/soundlib/mod_specifications.cpp ============================================================================== --- trunk/OpenMPT/soundlib/mod_specifications.cpp Wed Nov 27 15:02:51 2024 (r22327) +++ trunk/OpenMPT/soundlib/mod_specifications.cpp Wed Nov 27 23:18:46 2024 (r22328) @@ -97,7 +97,7 @@ 31, // SamplesMax 0, // instrumentMax MixLevels::Compatible, // defaultMixLevels - SONG_PT_MODE | SONG_AMIGALIMITS | SONG_ISAMIGA, // Supported song flags + SONG_PT_MODE | SONG_AMIGALIMITS | SONG_ISAMIGA | SONG_FORMAT_NO_VOLCOL, // Supported song flags 0, // Max MIDI mapping directives 0, // No instrument envelopes false, // No notecut. |
|
From: <sv...@op...> - 2024-11-27 14:03:03
|
Author: manx Date: Wed Nov 27 15:02:51 2024 New Revision: 22327 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22327 Log: Merged revision(s) 22325 from branches/OpenMPT-1.30: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. See r22319. [Fix] build: CI: GitHub: macOS: Remove work-around for Homebrew unxip breakage on macOS 13. See r22323. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Wed Nov 27 15:02:28 2024 (r22326) +++ branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Wed Nov 27 15:02:51 2024 (r22327) @@ -17,10 +17,8 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - run: brew pin unxip - name: fixup GitHub Homebrew python breakage - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies |
|
From: <sv...@op...> - 2024-11-27 14:02:40
|
Author: manx Date: Wed Nov 27 15:02:28 2024 New Revision: 22326 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22326 Log: Merged revision(s) 22325 from branches/OpenMPT-1.30: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. See r22319. [Fix] build: CI: GitHub: macOS: Remove work-around for Homebrew unxip breakage on macOS 13. See r22323. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Wed Nov 27 15:02:05 2024 (r22325) +++ branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Wed Nov 27 15:02:28 2024 (r22326) @@ -17,10 +17,8 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - run: brew pin unxip - name: fixup GitHub Homebrew python breakage - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies |
|
From: <sv...@op...> - 2024-11-27 14:02:23
|
Author: manx Date: Wed Nov 27 15:02:05 2024 New Revision: 22325 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22325 Log: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. See r22319. [Fix] build: CI: GitHub: macOS: Remove work-around for Homebrew unxip breakage on macOS 13. See r22323. Modified: branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml Wed Nov 27 15:00:28 2024 (r22324) +++ branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml Wed Nov 27 15:02:05 2024 (r22325) @@ -17,10 +17,8 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - run: brew pin unxip - name: fixup GitHub Homebrew python breakage - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies |
|
From: <sv...@op...> - 2024-11-27 14:00:35
|
Author: manx Date: Wed Nov 27 15:00:28 2024 New Revision: 22324 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22324 Log: Merged revision(s) 22319, 22323 from trunk/OpenMPT: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. ........ [Fix] build: CI: GitHub: macOS: Remove work-around for Homebrew unxip breakage on macOS 13. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Wed Nov 27 14:59:55 2024 (r22323) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Wed Nov 27 15:00:28 2024 (r22324) @@ -26,12 +26,9 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - if: ${{ matrix.host == 'macos-13' }} - run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Wed Nov 27 14:59:55 2024 (r22323) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Wed Nov 27 15:00:28 2024 (r22324) @@ -101,12 +101,9 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - if: ${{ matrix.host == 'macos-13' }} - run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies |
|
From: <sv...@op...> - 2024-11-27 14:00:02
|
Author: manx Date: Wed Nov 27 14:59:55 2024 New Revision: 22323 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22323 Log: [Fix] build: CI: GitHub: macOS: Remove work-around for Homebrew unxip breakage on macOS 13. Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Wed Nov 27 13:47:50 2024 (r22322) +++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Wed Nov 27 14:59:55 2024 (r22323) @@ -28,9 +28,6 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - if: ${{ matrix.host == 'macos-13' }} - run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.12 && brew link --overwrite python@3.12 Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Wed Nov 27 13:47:50 2024 (r22322) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Wed Nov 27 14:59:55 2024 (r22323) @@ -103,9 +103,6 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update - - name: fixup GitHub Homebrew unxip breakage - if: ${{ matrix.host == 'macos-13' }} - run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.12 && brew link --overwrite python@3.12 |
|
From: <sv...@op...> - 2024-11-27 12:48:02
|
Author: manx Date: Wed Nov 27 13:47:50 2024 New Revision: 22322 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22322 Log: Merged revision(s) 22320 from trunk/OpenMPT: [Ref] Use mpt::align_down. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mod.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mod.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mod.cpp Wed Nov 27 13:46:25 2024 (r22321) +++ branches/OpenMPT-1.31/soundlib/Load_mod.cpp Wed Nov 27 13:47:50 2024 (r22322) @@ -620,7 +620,7 @@ // There are some WOW files with an extra byte at the end, and also a MOD file (idntmind.mod, MD5 a3af5c3e1af269e32dfb6677c41c8453, SHA1 4884717c298575f9884b2211c762bb1725f73743) // where only the "official" patterns should be counted but the file also has an extra byte at the end. // Since MOD files can technically not have an odd file size, we just always round the actual file size down. - const auto fileSize = file.GetLength() & ~FileReader::pos_type{1}; + const auto fileSize = mpt::align_down(file.GetLength(), FileReader::pos_type{2}); if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == fileSize) { |
|
From: <sv...@op...> - 2024-11-27 12:46:37
|
Author: manx Date: Wed Nov 27 13:46:25 2024 New Revision: 22321 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22321 Log: Merged revision(s) 22318 from trunk/OpenMPT: [Ref] Enforce the bit maks for ANDing the file size to be of type pos_type. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mod.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mod.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mod.cpp Wed Nov 27 13:41:35 2024 (r22320) +++ branches/OpenMPT-1.31/soundlib/Load_mod.cpp Wed Nov 27 13:46:25 2024 (r22321) @@ -620,7 +620,7 @@ // There are some WOW files with an extra byte at the end, and also a MOD file (idntmind.mod, MD5 a3af5c3e1af269e32dfb6677c41c8453, SHA1 4884717c298575f9884b2211c762bb1725f73743) // where only the "official" patterns should be counted but the file also has an extra byte at the end. // Since MOD files can technically not have an odd file size, we just always round the actual file size down. - const auto fileSize = file.GetLength() & ~1; + const auto fileSize = file.GetLength() & ~FileReader::pos_type{1}; if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == fileSize) { |
|
From: <sv...@op...> - 2024-11-27 12:41:42
|
Author: manx Date: Wed Nov 27 13:41:35 2024 New Revision: 22320 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22320 Log: [Ref] Use mpt::align_down. Modified: trunk/OpenMPT/soundlib/MODTools.cpp Modified: trunk/OpenMPT/soundlib/MODTools.cpp ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.cpp Wed Nov 27 13:30:16 2024 (r22319) +++ trunk/OpenMPT/soundlib/MODTools.cpp Wed Nov 27 13:41:35 2024 (r22320) @@ -414,7 +414,7 @@ // There are some WOW files with an extra byte at the end, and also a MOD file (idntmind.mod, MD5 a3af5c3e1af269e32dfb6677c41c8453, SHA1 4884717c298575f9884b2211c762bb1725f73743) // where only the "official" patterns should be counted but the file also has an extra byte at the end. // Since MOD files can technically not have an odd file size, we just always round the actual file size down. - const auto fileSize = file.GetLength() & ~FileReader::pos_type{1}; + const auto fileSize = mpt::align_down(file.GetLength(), FileReader::pos_type{2}); if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == fileSize) { |
|
From: <sv...@op...> - 2024-11-27 12:30:28
|
Author: manx Date: Wed Nov 27 13:30:16 2024 New Revision: 22319 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22319 Log: [Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13. Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Tue Nov 26 21:14:21 2024 (r22318) +++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Wed Nov 27 13:30:16 2024 (r22319) @@ -33,7 +33,7 @@ run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Tue Nov 26 21:14:21 2024 (r22318) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Wed Nov 27 13:30:16 2024 (r22319) @@ -108,7 +108,7 @@ run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} - run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + run: brew unlink python@3.12 && brew link --overwrite python@3.12 - name: upgrade packages run: brew upgrade - name: install dependencies |
|
From: <sv...@op...> - 2024-11-26 20:14:33
|
Author: sagamusix Date: Tue Nov 26 21:14:21 2024 New Revision: 22318 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22318 Log: [Ref] Enforce the bit maks for ANDing the file size to be of type pos_type. Modified: trunk/OpenMPT/soundlib/MODTools.cpp Modified: trunk/OpenMPT/soundlib/MODTools.cpp ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.cpp Tue Nov 26 21:06:26 2024 (r22317) +++ trunk/OpenMPT/soundlib/MODTools.cpp Tue Nov 26 21:14:21 2024 (r22318) @@ -414,7 +414,7 @@ // There are some WOW files with an extra byte at the end, and also a MOD file (idntmind.mod, MD5 a3af5c3e1af269e32dfb6677c41c8453, SHA1 4884717c298575f9884b2211c762bb1725f73743) // where only the "official" patterns should be counted but the file also has an extra byte at the end. // Since MOD files can technically not have an odd file size, we just always round the actual file size down. - const auto fileSize = file.GetLength() & ~1; + const auto fileSize = file.GetLength() & ~FileReader::pos_type{1}; if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == fileSize) { |
|
From: <sv...@op...> - 2024-11-26 20:06:38
|
Author: sagamusix Date: Tue Nov 26 21:06:26 2024 New Revision: 22317 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22317 Log: Merged revision(s) 22316 from trunk/OpenMPT: [Mod] MOD: When checking if only the "official" part of the order list should be loaded, round down the file size to an even number. There is at least one MOD file in the wild with an odd file size that needs this quirk, and MOD files can technically not have an odd size anyway. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mod.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mod.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mod.cpp Tue Nov 26 21:05:15 2024 (r22316) +++ branches/OpenMPT-1.31/soundlib/Load_mod.cpp Tue Nov 26 21:06:26 2024 (r22317) @@ -617,8 +617,12 @@ const size_t patternStartOffset = file.GetPosition(); const size_t sizeWithoutPatterns = totalSampleLen + patternStartOffset; const size_t sizeWithOfficialPatterns = sizeWithoutPatterns + officialPatterns * numChannels * 256; + // There are some WOW files with an extra byte at the end, and also a MOD file (idntmind.mod, MD5 a3af5c3e1af269e32dfb6677c41c8453, SHA1 4884717c298575f9884b2211c762bb1725f73743) + // where only the "official" patterns should be counted but the file also has an extra byte at the end. + // Since MOD files can technically not have an odd file size, we just always round the actual file size down. + const auto fileSize = file.GetLength() & ~1; - if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == (file.GetLength() & ~1)) + if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == fileSize) { // Check if this is a Mod's Grave WOW file... WOW files use the M.K. magic but are actually 8CHN files. // We do a simple pattern validation as well for regular MOD files that have non-module data attached at the end @@ -627,7 +631,7 @@ if(ValidateMODPatternData(file, 16, true)) numChannels = 8; file.Seek(patternStartOffset); - } else if(numPatterns != officialPatterns && (validateHiddenPatterns || sizeWithOfficialPatterns == file.GetLength())) + } else if(numPatterns != officialPatterns && (validateHiddenPatterns || sizeWithOfficialPatterns == fileSize)) { // 15-sample SoundTracker specifics: // Fix SoundTracker modules where "hidden" patterns should be ignored. @@ -657,7 +661,7 @@ file.Seek(patternStartOffset); } - if(numPatternsIllegal > numPatterns && sizeWithoutPatterns + numPatternsIllegal * numChannels * 256 == file.GetLength()) + if(numPatternsIllegal > numPatterns && sizeWithoutPatterns + numPatternsIllegal * numChannels * 256 == fileSize) { // Even those illegal pattern indexes (> 128) appear to be valid... What a weird file! // e.g. NIETNU.MOD, where the end of the order list is filled with FF rather than 00, and the file actually contains 256 patterns. |
|
From: <sv...@op...> - 2024-11-26 20:05:29
|
Author: sagamusix Date: Tue Nov 26 21:05:15 2024 New Revision: 22316 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22316 Log: [Mod] MOD: When checking if only the "official" part of the order list should be loaded, round down the file size to an even number. There is at least one MOD file in the wild with an odd file size that needs this quirk, and MOD files can technically not have an odd size anyway. Modified: trunk/OpenMPT/soundlib/MODTools.cpp Modified: trunk/OpenMPT/soundlib/MODTools.cpp ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.cpp Tue Nov 26 19:34:14 2024 (r22315) +++ trunk/OpenMPT/soundlib/MODTools.cpp Tue Nov 26 21:05:15 2024 (r22316) @@ -411,8 +411,12 @@ const size_t patternStartOffset = file.GetPosition(); const size_t sizeWithoutPatterns = totalSampleLen + patternStartOffset; const size_t sizeWithOfficialPatterns = sizeWithoutPatterns + officialPatterns * sndFile.GetNumChannels() * 256; + // There are some WOW files with an extra byte at the end, and also a MOD file (idntmind.mod, MD5 a3af5c3e1af269e32dfb6677c41c8453, SHA1 4884717c298575f9884b2211c762bb1725f73743) + // where only the "official" patterns should be counted but the file also has an extra byte at the end. + // Since MOD files can technically not have an odd file size, we just always round the actual file size down. + const auto fileSize = file.GetLength() & ~1; - if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == (file.GetLength() & ~1)) + if(wowSampleLen && (wowSampleLen + patternStartOffset) + numPatterns * 8 * 256 == fileSize) { // Check if this is a Mod's Grave WOW file... WOW files use the M.K. magic but are actually 8CHN files. // We do a simple pattern validation as well for regular MOD files that have non-module data attached at the end @@ -421,7 +425,7 @@ if(ValidateMODPatternData(file, 16, true)) sndFile.ChnSettings.resize(8); file.Seek(patternStartOffset); - } else if(numPatterns != officialPatterns && (validateHiddenPatterns || sizeWithOfficialPatterns == file.GetLength())) + } else if(numPatterns != officialPatterns && (validateHiddenPatterns || sizeWithOfficialPatterns == fileSize)) { // 15-sample SoundTracker specifics: // Fix SoundTracker modules where "hidden" patterns should be ignored. @@ -451,7 +455,7 @@ file.Seek(patternStartOffset); } - if(numPatternsIllegal > numPatterns && sizeWithoutPatterns + numPatternsIllegal * sndFile.GetNumChannels() * 256 == file.GetLength()) + if(numPatternsIllegal > numPatterns && sizeWithoutPatterns + numPatternsIllegal * sndFile.GetNumChannels() * 256 == fileSize) { // Even those illegal pattern indexes (> 128) appear to be valid... What a weird file! // e.g. NIETNU.MOD, where the end of the order list is filled with FF rather than 00, and the file actually contains 256 patterns. |
|
From: <sv...@op...> - 2024-11-26 18:34:21
|
Author: sagamusix Date: Tue Nov 26 19:34:14 2024 New Revision: 22315 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22315 Log: [Fix] Don't send keyboard shortcut messages intended for MDI views to the view if another dialog currently has focus. Modified: trunk/OpenMPT/mptrack/MainFrm.cpp Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Tue Nov 26 09:13:10 2024 (r22314) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Tue Nov 26 19:34:14 2024 (r22315) @@ -2720,6 +2720,7 @@ default: // If handled neither by MainFrame nor by ModDoc, send it to the active view + // Note: MDIGetActive() will return a valid view even if we are currently in a modal dialog! CMDIChildWnd *pMDIActive = MDIGetActive(); CWnd *wnd = nullptr; if(pMDIActive) @@ -2733,12 +2734,12 @@ } // Backup solution for order navigation if the currently active view is not a pattern view, but a module is playing + // Note: This should also work if the currently active window is not a CMDIChildWnd, hence it happens before the GetActiveWindow() check. if(mpt::is_in_range(cmd, kcPrevNextOrderStart, kcPrevNextOrderEnd) && m_pSndFile && m_pSndFile->GetpModDoc() && wnd != nullptr && strcmp(wnd->GetRuntimeClass()->m_lpszClassName, "CViewPattern")) { - ResetNotificationBuffer(); CriticalSection cs; ORDERINDEX order = m_pSndFile->m_PlayState.m_nCurrentOrder; @@ -2747,6 +2748,10 @@ else order = m_pSndFile->Order().GetNextOrderIgnoringSkips(order); + if(order == m_pSndFile->m_PlayState.m_nCurrentOrder) + return wParam; + + ResetNotificationBuffer(); switch(wParam) { case kcPrevOrder: @@ -2769,9 +2774,10 @@ m_pSndFile->m_PlayState.m_nSeqOverride = order; break; } + return wParam; } - if(wnd) + if(wnd && GetActiveWindow() == this) return wnd->SendMessage(WM_MOD_KEYCOMMAND, wParam, lParam); return kcNull; } |
|
From: <sv...@op...> - 2024-11-26 08:13:18
|
Author: sagamusix Date: Tue Nov 26 09:13:10 2024 New Revision: 22314 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22314 Log: [Fix] Fix mime type property on DefaultKeyBindings.h, and add correct header include. Modified: trunk/OpenMPT/mptrack/DefaultKeyBindings.h (contents, props changed) Modified: trunk/OpenMPT/mptrack/DefaultKeyBindings.h ============================================================================== --- trunk/OpenMPT/mptrack/DefaultKeyBindings.h Mon Nov 25 23:36:11 2024 (r22313) +++ trunk/OpenMPT/mptrack/DefaultKeyBindings.h Tue Nov 26 09:13:10 2024 (r22314) @@ -8,7 +8,8 @@ */ -#include "stdafx.h" +#include "openmpt/all/BuildSettings.hpp" + #include "CommandSet.h" |
|
From: <sv...@op...> - 2024-11-25 22:36:23
|
Author: sagamusix Date: Mon Nov 25 23:36:11 2024 New Revision: 22313 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22313 Log: [Ref] Small cleanup. Modified: trunk/OpenMPT/soundlib/MODTools.cpp trunk/OpenMPT/soundlib/Snd_defs.h Modified: trunk/OpenMPT/soundlib/MODTools.cpp ============================================================================== --- trunk/OpenMPT/soundlib/MODTools.cpp Mon Nov 25 21:50:40 2024 (r22312) +++ trunk/OpenMPT/soundlib/MODTools.cpp Mon Nov 25 23:36:11 2024 (r22313) @@ -288,8 +288,8 @@ uint32 MODSampleHeader::GetInvalidByteScore() const { return ((volume > 64) ? 1 : 0) - + ((finetune > 15) ? 1 : 0) - + ((loopStart > length * 2) ? 1 : 0); + + ((finetune > 15) ? 1 : 0) + + ((loopStart > length * 2) ? 1 : 0); } @@ -330,7 +330,7 @@ } -// Check if a name is a valid null - terminated ASCII string with no garbage after the null terminator, or if it's empty +// Check if a name is a valid null-terminated ASCII string with no garbage after the null terminator, or if it's empty NameClassification ClassifyName(const mpt::span<const char> name) noexcept { bool foundNull = false, foundNormal = false; Modified: trunk/OpenMPT/soundlib/Snd_defs.h ============================================================================== --- trunk/OpenMPT/soundlib/Snd_defs.h Mon Nov 25 21:50:40 2024 (r22312) +++ trunk/OpenMPT/soundlib/Snd_defs.h Mon Nov 25 23:36:11 2024 (r22313) @@ -278,14 +278,13 @@ SONG_FIRSTTICK = 0x20, // Is set when the current tick is the first tick of the row SONG_MPTFILTERMODE = 0x40, // Local filter mode (reset filter on each note) SONG_SURROUNDPAN = 0x80, // Pan in the rear channels - SONG_POSJUMP = 0x100, // Position jump encountered (internal flag, do not touch) - SONG_BREAKTOROW = 0x200, // Break to row command encountered (internal flag, do not touch) + SONG_POSJUMP = 0x100, // Position jump encountered + SONG_BREAKTOROW = 0x200, // Break to row command encountered SONG_POSITIONCHANGED = 0x400, // Report to plugins that we jumped around in the module }; DECLARE_FLAGSET(PlayFlags) -// Module flags - contains both song configuration and playback state... Use SONG_FILE_FLAGS and SONG_PLAY_FLAGS distinguish between the two. enum SongFlags { SONG_FASTPORTAS = 0x01, // Portamentos are executed on every tick |
|
From: <sv...@op...> - 2024-11-25 20:50:47
|
Author: sagamusix Date: Mon Nov 25 21:50:40 2024 New Revision: 22312 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22312 Log: Merged revision(s) 22311 from trunk/OpenMPT: [Imp] MIDI Mapping Dialog: Decrease initial loading time if dialog by disabling redraw on dropdowns. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/MIDIMacroDialog.cpp Modified: branches/OpenMPT-1.31/mptrack/MIDIMacroDialog.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/MIDIMacroDialog.cpp Mon Nov 25 21:50:23 2024 (r22311) +++ branches/OpenMPT-1.31/mptrack/MIDIMacroDialog.cpp Mon Nov 25 21:50:40 2024 (r22312) @@ -63,41 +63,51 @@ m_EditZxx.SetLimitText(kMacroLength - 1); // Parametered macro selection + m_CbnSFx.SetRedraw(FALSE); for(int i = 0; i < 16; i++) { s.Format(_T("%d (SF%X)"), i, i); m_CbnSFx.AddString(s); } + m_CbnSFx.SetRedraw(TRUE); + m_CbnSFx.SetCurSel(0); // Parametered macro presets - m_CbnSFx.SetCurSel(0); + m_CbnSFxPreset.SetRedraw(FALSE); for(int i = 0; i < kSFxMax; i++) { m_CbnSFxPreset.SetItemData(m_CbnSFxPreset.AddString(m_MidiCfg.GetParameteredMacroName(static_cast<ParameteredMacro>(i))), i); } + m_CbnSFxPreset.SetRedraw(TRUE); OnSFxChanged(); // MIDI CC selection box + m_CbnMacroCC.SetRedraw(FALSE); for (int cc = MIDIEvents::MIDICC_start; cc <= MIDIEvents::MIDICC_end; cc++) { s.Format(_T("CC %02d "), cc); s += mpt::ToCString(mpt::Charset::UTF8, MIDIEvents::MidiCCNames[cc]); m_CbnMacroCC.SetItemData(m_CbnMacroCC.AddString(s), cc); } + m_CbnMacroCC.SetRedraw(TRUE); // Z80...ZFF box + m_CbnZxx.SetRedraw(FALSE); for(int zxx = 0x80; zxx <= 0xFF; zxx++) { s.Format(_T("Z%02X"), zxx); m_CbnZxx.AddString(s); } + m_CbnZxx.SetRedraw(TRUE); + m_CbnZxx.SetCurSel(0); // Fixed macro presets - m_CbnZxx.SetCurSel(0); + m_CbnZxxPreset.SetRedraw(FALSE); for(int i = 0; i < kZxxMax; i++) { m_CbnZxxPreset.SetItemData(m_CbnZxxPreset.AddString(m_MidiCfg.GetFixedMacroName(static_cast<FixedMacro>(i))), i); } + m_CbnZxxPreset.SetRedraw(TRUE); m_CbnZxxPreset.SetCurSel(m_MidiCfg.GetFixedMacroType()); UpdateDialog(); |
|
From: <sv...@op...> - 2024-11-25 20:50:30
|
Author: sagamusix Date: Mon Nov 25 21:50:23 2024 New Revision: 22311 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22311 Log: [Imp] MIDI Mapping Dialog: Decrease initial loading time if dialog by disabling redraw on dropdowns. Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp Mon Nov 25 20:56:20 2024 (r22310) +++ trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp Mon Nov 25 21:50:23 2024 (r22311) @@ -73,41 +73,51 @@ m_EditZxx.SetLimitText(kMacroLength - 1); // Parametered macro selection + m_CbnSFx.SetRedraw(FALSE); for(int i = 0; i < 16; i++) { s.Format(_T("%d (SF%X)"), i, i); m_CbnSFx.AddString(s); } + m_CbnSFx.SetRedraw(TRUE); + m_CbnSFx.SetCurSel(0); // Parametered macro presets - m_CbnSFx.SetCurSel(0); + m_CbnSFxPreset.SetRedraw(FALSE); for(int i = 0; i < kSFxMax; i++) { m_CbnSFxPreset.SetItemData(m_CbnSFxPreset.AddString(m_MidiCfg.GetParameteredMacroName(static_cast<ParameteredMacro>(i))), i); } + m_CbnSFxPreset.SetRedraw(TRUE); OnSFxChanged(); // MIDI CC selection box + m_CbnMacroCC.SetRedraw(FALSE); for (int cc = MIDIEvents::MIDICC_start; cc <= MIDIEvents::MIDICC_end; cc++) { s.Format(_T("CC %02d "), cc); s += mpt::ToCString(mpt::Charset::UTF8, MIDIEvents::MidiCCNames[cc]); m_CbnMacroCC.SetItemData(m_CbnMacroCC.AddString(s), cc); } + m_CbnMacroCC.SetRedraw(TRUE); // Z80...ZFF box + m_CbnZxx.SetRedraw(FALSE); for(int zxx = 0x80; zxx <= 0xFF; zxx++) { s.Format(_T("Z%02X"), zxx); m_CbnZxx.AddString(s); } + m_CbnZxx.SetRedraw(TRUE); + m_CbnZxx.SetCurSel(0); // Fixed macro presets - m_CbnZxx.SetCurSel(0); + m_CbnZxxPreset.SetRedraw(FALSE); for(int i = 0; i < kZxxMax; i++) { m_CbnZxxPreset.SetItemData(m_CbnZxxPreset.AddString(m_MidiCfg.GetFixedMacroName(static_cast<FixedMacro>(i))), i); } + m_CbnZxxPreset.SetRedraw(TRUE); m_CbnZxxPreset.SetCurSel(m_MidiCfg.GetFixedMacroType()); UpdateDialog(); |
|
From: <sv...@op...> - 2024-11-25 19:56:32
|
Author: sagamusix Date: Mon Nov 25 20:56:20 2024 New Revision: 22310 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22310 Log: [Ref] CommandSet: Small cleanup. Modified: trunk/OpenMPT/mptrack/CommandSet.cpp trunk/OpenMPT/mptrack/CommandSet.h trunk/OpenMPT/mptrack/DefaultKeyBindings.h Modified: trunk/OpenMPT/mptrack/CommandSet.cpp ============================================================================== --- trunk/OpenMPT/mptrack/CommandSet.cpp Mon Nov 25 19:39:07 2024 (r22309) +++ trunk/OpenMPT/mptrack/CommandSet.cpp Mon Nov 25 20:56:20 2024 (r22310) @@ -83,9 +83,9 @@ // Setup -KeyCommand::KeyCommand(uint32 uid, const TCHAR *message, std::vector<KeyCombination> keys) +KeyCommand::KeyCommand(uint32 uid, const TCHAR *commandName, std::vector<KeyCombination> keys) : kcList{std::move(keys)} - , Message{message} + , name{commandName} , UID{uid} { } @@ -964,11 +964,11 @@ for(int i = kcVPStartNotes; i <= kcVPEndNotes; i++) { - m_commands[i - kcVPStartNotes + contextStartNotes] = {KeyCommand::Hidden, m_commands[i].Message}; + m_commands[i - kcVPStartNotes + contextStartNotes] = {KeyCommand::Hidden, m_commands[i].name}; } for(int i = kcVPStartNoteStops; i <= kcVPEndNoteStops; i++) { - m_commands[i - kcVPStartNoteStops + contextStopNotes] = {KeyCommand::Hidden, m_commands[i].Message}; + m_commands[i - kcVPStartNoteStops + contextStopNotes] = {KeyCommand::Hidden, m_commands[i].name}; } } Modified: trunk/OpenMPT/mptrack/CommandSet.h ============================================================================== --- trunk/OpenMPT/mptrack/CommandSet.h Mon Nov 25 19:39:07 2024 (r22309) +++ trunk/OpenMPT/mptrack/CommandSet.h Mon Nov 25 20:56:20 2024 (r22310) @@ -14,7 +14,6 @@ #include "openmpt/base/FlagSet.hpp" #include <bitset> #include <map> -#include <string> OPENMPT_NAMESPACE_BEGIN @@ -1197,8 +1196,6 @@ using KeyMap = std::multimap<KeyCombination, CommandID>; using KeyMapRange = std::pair<KeyMap::const_iterator, KeyMap::const_iterator>; -//KeyMap - struct KeyCommand { static constexpr uint32 Dummy = 1u << 31; @@ -1206,14 +1203,14 @@ static constexpr uint32 UIDMask = Hidden - 1u; std::vector<KeyCombination> kcList; - CString Message; + CString name; protected: uint32 UID = 0; public: KeyCommand() = default; - KeyCommand(uint32 uid, const TCHAR *message = _T(""), std::vector<KeyCombination> keys = {}); + KeyCommand(uint32 uid, const TCHAR *commandName = _T(""), std::vector<KeyCombination> keys = {}); // Unique ID for on-disk keymap format. // Note that hidden commands do not have a unique ID, because they are never written to keymap files. @@ -1234,40 +1231,10 @@ }; -enum RuleID -{ - krPreventDuplicate, - krDeleteOldOnConflict, - - krAllowNavigationWithSelection, - krAllowSelectionWithNavigation, - krAutoSelectOff, - krAllowSelectCopySelectCombos, - krLockNotesToChords, - krNoteOffOnKeyRelease, - krPropagateNotes, - krReassignDigitsToOctaves, - krAutoSpacing, - krCheckModifiers, - krPropagateSampleManipulation, - kNumRules -}; - struct CModSpecifications; class CCommandSet { -protected: - //util - void SetupCommands(); - void SetupContextHierarchy(); - void EnforceAll(KeyCombination kc, CommandID cmd, bool adding); - - CommandID FindCmd(uint32 uid) const; - bool KeyCombinationConflict(KeyCombination kc1, KeyCombination kc2, bool checkEventConflict = true) const; - - void ApplyDefaultKeybindings(KeyboardPreset preset, const Version onlyCommandsAfterVersion = {}); - public: CCommandSet(); @@ -1290,7 +1257,7 @@ mpt::span<const KeyCombination> GetKeyChoices(CommandID cmd) const { return mpt::as_span(m_commands[cmd].kcList); } bool IsHidden(UINT c) const { return m_commands[c].IsHidden(); } int GetKeyListSize(CommandID cmd) const { return (cmd != kcNull) ? static_cast<int>(m_commands[cmd].kcList.size()) : 0; } - CString GetCommandText(CommandID cmd) const { return m_commands[cmd].Message; } + CString GetCommandText(CommandID cmd) const { return m_commands[cmd].name; } CString GetKeyTextFromCommand(CommandID c, UINT key = uint32_max) const; CString FormatConflict(KeyCombination kc, CommandID conflictCommand, KeyCombination conflictCombination) const; @@ -1305,8 +1272,36 @@ static bool MustBeModifierKey(CommandID id); protected: + void SetupCommands(); + void SetupContextHierarchy(); + void EnforceAll(KeyCombination kc, CommandID cmd, bool adding); + + CommandID FindCmd(uint32 uid) const; + bool KeyCombinationConflict(KeyCombination kc1, KeyCombination kc2, bool checkEventConflict = true) const; + + void ApplyDefaultKeybindings(KeyboardPreset preset, const Version onlyCommandsAfterVersion = {}); + + enum RuleID + { + krPreventDuplicate, + krDeleteOldOnConflict, + + krAllowNavigationWithSelection, + krAllowSelectionWithNavigation, + krAutoSelectOff, + krAllowSelectCopySelectCombos, + krLockNotesToChords, + krNoteOffOnKeyRelease, + krPropagateNotes, + krReassignDigitsToOctaves, + krAutoSpacing, + krCheckModifiers, + krPropagateSampleManipulation, + kNumRules + }; + const CModSpecifications *m_currentModSpecs = nullptr; - KeyCommand m_commands[kcNumCommands]; + std::array<KeyCommand, kcNumCommands> m_commands; std::bitset<kCtxMaxInputContexts> m_isParentContext[kCtxMaxInputContexts]; std::bitset<kNumRules> m_enforceRule; }; Modified: trunk/OpenMPT/mptrack/DefaultKeyBindings.h ============================================================================== --- trunk/OpenMPT/mptrack/DefaultKeyBindings.h Mon Nov 25 19:39:07 2024 (r22309) +++ trunk/OpenMPT/mptrack/DefaultKeyBindings.h Mon Nov 25 20:56:20 2024 (r22310) @@ -1,7 +1,7 @@ /* * DefaultKeyBindings.h * -------------------- - * Purpose: The default key binding definitions, including IT and FT2 flavours + * Purpose: The default key binding definitions, including IT and FT2 flavours. * Notes : (currently none) * Authors: OpenMPT Devs * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. |
|
From: <sv...@op...> - 2024-11-25 18:39:19
|
Author: sagamusix Date: Mon Nov 25 19:39:07 2024 New Revision: 22309 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22309 Log: [Mod] After seeking, inform plugins about the new playback position immediately if playback is stopped (https://bugs.openmpt.org/view.php?id=1731). Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp trunk/OpenMPT/soundlib/Sndfile.cpp trunk/OpenMPT/soundlib/Sndfile.h Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Nov 25 19:35:24 2024 (r22308) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Nov 25 19:39:07 2024 (r22309) @@ -1428,6 +1428,8 @@ { m_MixPlugins[plug].fDryRatio = dryWetRatio; } + + UpdatePluginPositions(); #endif // NO_PLUGINS } else if(adjustMode != eAdjustOnSuccess) { Modified: trunk/OpenMPT/soundlib/Sndfile.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.cpp Mon Nov 25 19:35:24 2024 (r22308) +++ trunk/OpenMPT/soundlib/Sndfile.cpp Mon Nov 25 19:39:07 2024 (r22309) @@ -1019,6 +1019,25 @@ } +void CSoundFile::UpdatePluginPositions() +{ +#ifndef NO_PLUGINS + float out = 0.0f; + for(auto &plugin : m_MixPlugins) + { + IMixPlugin *pPlugin = plugin.pMixPlugin; + if(pPlugin != nullptr && !pPlugin->IsResumed()) + { + pPlugin->PositionChanged(); + pPlugin->Resume(); + pPlugin->Process(&out, &out, 0); + pPlugin->Suspend(); + } + } +#endif // NO_PLUGINS +} + + void CSoundFile::StopAllVsti() { #ifndef NO_PLUGINS Modified: trunk/OpenMPT/soundlib/Sndfile.h ============================================================================== --- trunk/OpenMPT/soundlib/Sndfile.h Mon Nov 25 19:35:24 2024 (r22308) +++ trunk/OpenMPT/soundlib/Sndfile.h Mon Nov 25 19:39:07 2024 (r22309) @@ -966,6 +966,7 @@ // Real-time sound functions void SuspendPlugins(); void ResumePlugins(); + void UpdatePluginPositions(); void StopAllVsti(); void RecalculateGainForAllPlugs(); void ResetChannels(); |
|
From: <sv...@op...> - 2024-11-25 18:35:36
|
Author: manx Date: Mon Nov 25 19:35:24 2024 New Revision: 22308 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22308 Log: [Fix] build: Makefile: MinGW: Set MPT_COMPILER_NOALLOCAH=1 to fix Vorbis build. Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk trunk/OpenMPT/build/make/config-mingw.mk trunk/OpenMPT/build/make/config-mingw32crt.mk Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw-w64.mk Mon Nov 25 19:34:42 2024 (r22307) +++ trunk/OpenMPT/build/make/config-mingw-w64.mk Mon Nov 25 19:35:24 2024 (r22308) @@ -123,6 +123,8 @@ $(error unknown WINDOWS_VERSION) endif +MPT_COMPILER_NOALLOCAH=1 + ifneq ($(MINGW_COMPILER),clang) # See <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115049>. MPT_COMPILER_NOIPARA=1 Modified: trunk/OpenMPT/build/make/config-mingw.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw.mk Mon Nov 25 19:34:42 2024 (r22307) +++ trunk/OpenMPT/build/make/config-mingw.mk Mon Nov 25 19:35:24 2024 (r22308) @@ -74,6 +74,8 @@ CFLAGS += -ffunction-sections -fdata-sections LDFLAGS += -Wl,--gc-sections +MPT_COMPILER_NOALLOCAH=1 + CXXFLAGS += -march=i586 -m80387 -mtune=pentium CFLAGS += -march=i586 -m80387 -mtune=pentium Modified: trunk/OpenMPT/build/make/config-mingw32crt.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw32crt.mk Mon Nov 25 19:34:42 2024 (r22307) +++ trunk/OpenMPT/build/make/config-mingw32crt.mk Mon Nov 25 19:35:24 2024 (r22308) @@ -74,6 +74,8 @@ CFLAGS += -ffunction-sections -fdata-sections LDFLAGS += -Wl,--gc-sections +MPT_COMPILER_NOALLOCAH=1 + CXXFLAGS += -march=i386 -m80387 -mtune=i486 CFLAGS += -march=i386 -m80387 -mtune=i486 |
|
From: <sv...@op...> - 2024-11-25 18:34:49
|
Author: manx Date: Mon Nov 25 19:34:42 2024 New Revision: 22307 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22307 Log: [Imp] build: Makefile: MinGW: Honor ALLOW_LGPL. Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk trunk/OpenMPT/build/make/config-mingw.mk trunk/OpenMPT/build/make/config-mingw32crt.mk Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw-w64.mk Mon Nov 25 19:32:31 2024 (r22306) +++ trunk/OpenMPT/build/make/config-mingw-w64.mk Mon Nov 25 19:34:42 2024 (r22307) @@ -149,11 +149,19 @@ IS_CROSS=1 +ifeq ($(ALLOW_LGPL),1) +LOCAL_ZLIB=1 +LOCAL_MPG123=1 +LOCAL_OGG=1 +LOCAL_VORBIS=1 +else NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 +endif + NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 Modified: trunk/OpenMPT/build/make/config-mingw.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw.mk Mon Nov 25 19:32:31 2024 (r22306) +++ trunk/OpenMPT/build/make/config-mingw.mk Mon Nov 25 19:34:42 2024 (r22307) @@ -102,11 +102,19 @@ IS_CROSS=1 +ifeq ($(ALLOW_LGPL),1) +LOCAL_ZLIB=1 +LOCAL_MPG123=1 +LOCAL_OGG=1 +LOCAL_VORBIS=1 +else NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 +endif + NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 Modified: trunk/OpenMPT/build/make/config-mingw32crt.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw32crt.mk Mon Nov 25 19:32:31 2024 (r22306) +++ trunk/OpenMPT/build/make/config-mingw32crt.mk Mon Nov 25 19:34:42 2024 (r22307) @@ -103,11 +103,19 @@ IS_CROSS=1 +ifeq ($(ALLOW_LGPL),1) +LOCAL_ZLIB=1 +LOCAL_MPG123=1 +LOCAL_OGG=1 +LOCAL_VORBIS=1 +else NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 +endif + NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 |
|
From: <sv...@op...> - 2024-11-25 18:32:38
|
Author: manx Date: Mon Nov 25 19:32:31 2024 New Revision: 22306 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22306 Log: [Fix] mpg123: Support off_t handling for MinGW in Makefile builds. Modified: trunk/OpenMPT/include/mpg123/ports/makefile/config.h Modified: trunk/OpenMPT/include/mpg123/ports/makefile/config.h ============================================================================== --- trunk/OpenMPT/include/mpg123/ports/makefile/config.h Mon Nov 25 19:29:56 2024 (r22305) +++ trunk/OpenMPT/include/mpg123/ports/makefile/config.h Mon Nov 25 19:32:31 2024 (r22306) @@ -29,7 +29,19 @@ /* yeah, POSIX ... */ -#if defined(__DJGPP__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) +#if defined(_FILE_OFFSET_BITS) +#if (_FILE_OFFSET_BITS == 64) +#define SIZEOF_OFF_T 8 +#elif (_FILE_OFFSET_BITS == 32) +#define SIZEOF_OFF_T 4 +#else +#define SIZEOF_OFF_T 4 +#endif +#else +#define SIZEOF_OFF_T 4 +#endif +#elif defined(__DJGPP__) #define SIZEOF_OFF_T 4 #else #define SIZEOF_OFF_T 8 |
3 messages has been excluded from this view by a project administrator.
