Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5356] trunk/OpenMPT
|
From: <sag...@us...> - 2015-06-26 13:51:30
|
Revision: 5356
http://sourceforge.net/p/modplug/code/5356
Author: saga-games
Date: 2015-06-26 13:51:21 +0000 (Fri, 26 Jun 2015)
Log Message:
-----------
[Mod] Move MIDI record option to MIDI config tab.
[Mod] OpenMPT: Version is now 1.25.00.16
Modified Paths:
--------------
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/TrackerSettings.h
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/common/versionNumber.h 2015-06-26 13:51:21 UTC (rev 5356)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 25
#define VER_MINOR 00
-#define VER_MINORMINOR 15
+#define VER_MINORMINOR 16
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp 2015-06-26 13:51:21 UTC (rev 5356)
@@ -53,7 +53,6 @@
{PATTERN_CONTSCROLL, "Continuous scroll", "Jumps to the next pattern when moving past the end of a pattern"},
{PATTERN_KBDNOTEOFF, "Record note off", "Record note off when a key is released on the PC keyboard."},
{PATTERN_FOLLOWSONGOFF, "Follow song off by default", "Ensure follow song is off when opening or starting a new song."},
- {PATTERN_MIDIRECORD, "MIDI record", "Enable MIDI in record by default."},
{PATTERN_OLDCTXMENUSTYLE, "Old style pattern context menu", "Check this option to hide unavailable items in the pattern editor context menu. Uncheck to grey-out unavailable items instead."},
{PATTERN_SYNCMUTE, "Maintain sample sync on mute", "Samples continue to be processed when channels are muted (like in IT2 and FT2)"},
{PATTERN_SYNCSAMPLEPOS, "Maintain sample sync on seek", "Sample that are still active from previous patterns are continued to be played after seeking.\nNote: Some pattern commands may prevent samples from being synced. This feature may slow down seeking."},
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2015-06-26 13:51:21 UTC (rev 5356)
@@ -340,7 +340,7 @@
UpdateColors();
- if(TrackerSettings::Instance().m_dwPatternSetup & PATTERN_MIDIRECORD) midiOpenDevice(false);
+ if(TrackerSettings::Instance().m_dwMidiSetup & MIDISETUP_ENABLE_RECORD_DEFAULT) midiOpenDevice(false);
HtmlHelpW(m_hWnd, nullptr, HH_INITIALIZE, reinterpret_cast<DWORD_PTR>(&helpCookie));
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2015-06-26 13:51:21 UTC (rev 5356)
@@ -1711,6 +1711,7 @@
ON_CBN_SELCHANGE(IDC_COMBO2, OnSettingsChanged)
ON_COMMAND(IDC_CHECK1, OnSettingsChanged)
ON_COMMAND(IDC_CHECK2, OnSettingsChanged)
+ ON_COMMAND(IDC_CHECK3, OnSettingsChanged)
ON_COMMAND(IDC_CHECK4, OnSettingsChanged)
ON_COMMAND(IDC_MIDI_TO_PLUGIN, OnSettingsChanged)
ON_COMMAND(IDC_MIDI_MACRO_CONTROL, OnSettingsChanged)
@@ -1745,6 +1746,7 @@
// Flags
if (m_dwMidiSetup & MIDISETUP_RECORDVELOCITY) CheckDlgButton(IDC_CHECK1, BST_CHECKED);
if (m_dwMidiSetup & MIDISETUP_RECORDNOTEOFF) CheckDlgButton(IDC_CHECK2, BST_CHECKED);
+ if (m_dwMidiSetup & MIDISETUP_ENABLE_RECORD_DEFAULT) CheckDlgButton(IDC_CHECK3, BST_CHECKED);
if (m_dwMidiSetup & MIDISETUP_TRANSPOSEKEYBOARD) CheckDlgButton(IDC_CHECK4, BST_CHECKED);
if (m_dwMidiSetup & MIDISETUP_MIDITOPLUG) CheckDlgButton(IDC_MIDI_TO_PLUGIN, BST_CHECKED);
if (m_dwMidiSetup & MIDISETUP_MIDIMACROCONTROL) CheckDlgButton(IDC_MIDI_MACRO_CONTROL, BST_CHECKED);
@@ -1812,6 +1814,7 @@
m_nMidiDevice = MIDI_MAPPER;
if (IsDlgButtonChecked(IDC_CHECK1)) m_dwMidiSetup |= MIDISETUP_RECORDVELOCITY;
if (IsDlgButtonChecked(IDC_CHECK2)) m_dwMidiSetup |= MIDISETUP_RECORDNOTEOFF;
+ if (IsDlgButtonChecked(IDC_CHECK3)) m_dwMidiSetup |= MIDISETUP_ENABLE_RECORD_DEFAULT;
if (IsDlgButtonChecked(IDC_CHECK4)) m_dwMidiSetup |= MIDISETUP_TRANSPOSEKEYBOARD;
if (IsDlgButtonChecked(IDC_MIDI_TO_PLUGIN)) m_dwMidiSetup |= MIDISETUP_MIDITOPLUG;
if (IsDlgButtonChecked(IDC_MIDI_MACRO_CONTROL)) m_dwMidiSetup |= MIDISETUP_MIDIMACROCONTROL;
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-06-26 13:51:21 UTC (rev 5356)
@@ -590,11 +590,16 @@
patternFont = FontSetting((m_dwPatternSetup & 0x08) ? PATTERNFONT_SMALL : PATTERNFONT_LARGE, 0);
m_dwPatternSetup &= ~(0x08 | 0x02);
}
-
if(storedVersion < MAKE_VERSION_NUMERIC(1,25,00,08))
{
glGeneralWindowHeight += 44;
}
+ if(storedVersion < MAKE_VERSION_NUMERIC(1,25,00,16) && (m_dwPatternSetup & 0x100000))
+ {
+ // Move MIDI recording to MIDI setup
+ m_dwPatternSetup &= ~0x100000;
+ m_dwMidiSetup |= MIDISETUP_ENABLE_RECORD_DEFAULT;
+ }
// Effects
#ifndef NO_EQ
Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h 2015-06-26 13:51:21 UTC (rev 5356)
@@ -96,7 +96,7 @@
#define PATTERN_CONTSCROLL 0x20000 // continous pattern scrolling
#define PATTERN_KBDNOTEOFF 0x40000 // Record note-off events
#define PATTERN_FOLLOWSONGOFF 0x80000 // follow song off by default
-#define PATTERN_MIDIRECORD 0x100000 // MIDI Record on by default
+//#define PATTERN_MIDIRECORD 0x100000 // MIDI Record on by default
#define PATTERN_NOCLOSEDIALOG 0x200000 // Don't use OpenMPT's custom close dialog with a list of saved files when closing the main window
#define PATTERN_DBLCLICKSELECT 0x400000 // Double-clicking pattern selects whole channel
#define PATTERN_OLDCTXMENUSTYLE 0x800000 // Hide pattern context menu entries instead of greying them out.
@@ -112,7 +112,7 @@
#define PATTERNFONT_SMALL "@1"
#define PATTERNFONT_LARGE "@2"
-// Midi Setup
+// MIDI Setup
#define MIDISETUP_RECORDVELOCITY 0x01 // Record MIDI velocity
#define MIDISETUP_TRANSPOSEKEYBOARD 0x02 // Apply transpose value to MIDI Notes
#define MIDISETUP_MIDITOPLUG 0x04 // Pass MIDI messages to plugins
@@ -121,6 +121,7 @@
#define MIDISETUP_RESPONDTOPLAYCONTROLMSGS 0x20 // Respond to Restart/Continue/Stop MIDI commands
#define MIDISETUP_MIDIMACROCONTROL 0x80 // Record MIDI controller changes a MIDI macro changes in pattern
#define MIDISETUP_PLAYPATTERNONMIDIIN 0x100 // Play pattern if MIDI Note is received and playback is paused
+#define MIDISETUP_ENABLE_RECORD_DEFAULT 0x200 // Enable MIDI recording by default
// EQ
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2015-06-26 12:51:11 UTC (rev 5355)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2015-06-26 13:51:21 UTC (rev 5356)
@@ -811,7 +811,6 @@
CAPTION "MIDI"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "MIDI Recording",IDC_STATIC,6,6,276,108
LTEXT "MIDI Input Device:",IDC_STATIC,18,18,67,8
COMBOBOX IDC_COMBO1,18,30,252,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Apply Octave Transpose to incoming MIDI Notes",IDC_CHECK4,
@@ -823,27 +822,30 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,84,237,12
CONTROL "Pass MIDI to active instrument plugin",IDC_MIDI_TO_PLUGIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,237,12
- GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,276,90
+ CONTROL "Enable MIDI recording when launching OpenMPT",IDC_CHECK3,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,108,240,12
CONTROL "Record MIDI Note Velocity, amplify by",IDC_CHECK1,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,138,144,10
- EDITTEXT IDC_EDIT3,162,137,42,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,186,132,11,14
- LTEXT "%",IDC_STATIC,207,139,48,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,150,144,10
+ EDITTEXT IDC_EDIT3,162,150,42,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,186,145,11,14
+ LTEXT "%",IDC_STATIC,207,151,48,8
CONTROL "Combine MIDI Volume (CC#07) to Note Velocity",IDC_MIDIVOL_TO_NOTEVOL,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,150,237,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,162,237,12
CONTROL "Record MIDI Controller changes as MIDI Macro changes in pattern",IDC_MIDI_MACRO_CONTROL,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,162,237,12
- LTEXT "Ignore CCs (e.g. 1,123,127)",IDC_STATIC,30,176,108,8
- EDITTEXT IDC_EDIT4,138,174,132,12,ES_AUTOHSCROLL
- LTEXT "Record Aftertouch Messages",IDC_STATIC,30,192,108,12,SS_CENTERIMAGE
- COMBOBOX IDC_COMBO2,138,192,132,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "MIDI File Import",IDC_STATIC,6,216,276,36
- LTEXT "Speed:",IDC_STATIC,18,234,24,8
- EDITTEXT IDC_EDIT1,48,232,39,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,78,234,11,14
- LTEXT "Pattern Size:",IDC_STATIC,102,234,56,8
- EDITTEXT IDC_EDIT2,156,232,39,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,180,234,11,14
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,174,237,12
+ LTEXT "Ignore CCs (e.g. 1,123,127)",IDC_STATIC,30,188,108,8
+ EDITTEXT IDC_EDIT4,138,186,132,12,ES_AUTOHSCROLL
+ LTEXT "Record Aftertouch Messages",IDC_STATIC,30,204,108,12,SS_CENTERIMAGE
+ COMBOBOX IDC_COMBO2,138,204,132,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Speed:",IDC_STATIC,18,246,24,8
+ EDITTEXT IDC_EDIT1,48,244,39,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,78,246,11,14
+ LTEXT "Pattern Size:",IDC_STATIC,102,246,56,8
+ EDITTEXT IDC_EDIT2,156,244,39,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "Spin1",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,180,246,11,14
+ GROUPBOX "MIDI Recording",IDC_STATIC,6,6,276,120
+ GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,132,276,90
+ GROUPBOX "MIDI File Import",IDC_STATIC,6,228,276,36
END
IDD_LOADRAWSAMPLE DIALOGEX 0, 0, 178, 95
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
