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

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

Revision: 5370
          http://sourceforge.net/p/modplug/code/5370
Author:   saga-games
Date:     2015-06-27 16:14:27 +0000 (Sat, 27 Jun 2015)
Log Message:
-----------
[Fix] Pattern tab: Fix for partially broken stuff in r5367
[Imp] Allow sending incoming MIDI notes to plugins even if no instrument is assigned to them (pass data as-is)

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/5367

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Draw_pat.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2015-06-27 14:41:53 UTC (rev 5369)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2015-06-27 16:14:27 UTC (rev 5370)
@@ -253,11 +253,11 @@
 {
 	const PATTERNFONT *pfnt = PatternFont::currentFont;
 	int xofs = GetXScrollPos();
-	int yofs = GetYScrollPos() + GetSmoothScrollOffset();
+	int yofs = GetYScrollPos();
 	int x = xofs + (pt.x - m_szHeader.cx) / GetColumnWidth();
 	if (pt.x < m_szHeader.cx) x = (xofs) ? xofs - 1 : 0;
 
-	int y = yofs - m_nMidRow + (pt.y - m_szHeader.cy) / m_szCell.cy;
+	int y = yofs - m_nMidRow + (pt.y - m_szHeader.cy + GetSmoothScrollOffset()) / m_szCell.cy;
 	if (y < 0) y = 0;
 	int xx = (pt.x - m_szHeader.cx) % GetColumnWidth(), dx = 0;
 	int imax = 4;
@@ -484,7 +484,6 @@
 	const int vuHeight = MulDiv(VUMETERS_HEIGHT, m_nDPIy, 96);
 	const int colHeight = MulDiv(COLHDR_HEIGHT, m_nDPIy, 96);
 	const int recordInsX = MulDiv(3, m_nDPIx, 96);
-	const bool liveRecord = IsLiveRecord();
 	const bool doSmoothScroll = (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_SMOOTHSCROLL) != 0;
 
 	GetClientRect(&rcClient);

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2015-06-27 14:41:53 UTC (rev 5369)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2015-06-27 16:14:27 UTC (rev 5370)
@@ -1018,6 +1018,9 @@
 				PlayNote(note, ins, 0, false, vol);
 			}
 			return;
+		} else
+		{
+			plugin->MidiSend(midiData);
 		}
 		break;
 

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