[OMPT-svn-commit] SF.net SVN: modplug:[794] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 794
          http://modplug.svn.sourceforge.net/modplug/?rev=794&view=rev
Author:   saga-games
Date:     2011-02-05 18:06:06 +0000 (Sat, 05 Feb 2011)

Log Message:
-----------
[Fix] When automatically entering note-offs in the pattern (MIDI or normal keyboard), keyboard split is now handled properly (apparently this broke some time after v1.18.03.00)
[Mod] OpenMPT: Version is now 1.19.00.22

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2011-01-31 23:32:12 UTC (rev 793)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2011-02-05 18:06:06 UTC (rev 794)
@@ -3242,8 +3242,8 @@
 			else nVol = (nVol + 3) / 4; //Value from [0,256] to [0,64]
 			TempEnterNote(nNote, true, nVol);
 			
-			// continue playing as soon as MIDI notes are being received (request 2813)
-			if(pSndFile->IsPaused() && CMainFrame::m_dwMidiSetup & MIDISETUP_PLAYPATTERNONMIDIIN)
+			// continue playing as soon as MIDI notes are being received (http://forum.openmpt.org/index.php?topic=2813.0)
+			if(pSndFile->IsPaused() && (CMainFrame::m_dwMidiSetup & MIDISETUP_PLAYPATTERNONMIDIIN))
 				pModDoc->OnPatternPlayNoLoop();
 				
 		break;
@@ -4025,7 +4025,7 @@
 	const UINT nTick = pSndFile->m_nTickCount;
 	const PATTERNINDEX nPatPlayback = pSndFile->m_nPattern;
 
-	const bool isSplit = (note <= pModDoc->GetSplitKeyboardSettings()->splitNote);
+	const bool isSplit = (pModDoc->GetSplitKeyboardSettings()->IsSplitActive()) && (note <= pModDoc->GetSplitKeyboardSettings()->splitNote);
 	UINT ins = 0;
 	if (pModDoc)
 	{
@@ -4050,7 +4050,7 @@
 	}
 
 	//Enter note off in pattern?
-	if ((note < 1) || (note > NOTE_MAX))
+	if ((note < NOTE_MIN) || (note > NOTE_MAX))
 		return;
 	if ((m_dwCursor & 7) > 1 && (bChordMode || !fromMidi))
 		return;
@@ -4066,7 +4066,9 @@
 
 	activeNoteMap[note] = 0xFF;	//unlock channel
 
-	if  (!(CMainFrame::m_dwPatternSetup&PATTERN_KBDNOTEOFF || fromMidi)) {
+	if (!((CMainFrame::m_dwPatternSetup & PATTERN_KBDNOTEOFF) || fromMidi))
+	{
+		// We don't want to write the note-off into the pattern if this feature is disabled and we're not recording from MIDI.
 		return;
 	}
 

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2011-01-31 23:32:12 UTC (rev 793)
+++ trunk/OpenMPT/mptrack/version.h	2011-02-05 18:06:06 UTC (rev 794)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					19
 #define VER_MINOR					00
-#define VER_MINORMINOR				21
+#define VER_MINORMINOR				22
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.