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

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

Revision: 973
          http://modplug.svn.sourceforge.net/modplug/?rev=973&view=rev
Author:   saga-games
Date:     2011-08-09 14:45:39 +0000 (Tue, 09 Aug 2011)

Log Message:
-----------
[Fix] Instrument Editor: Aftertouch messages forwarded to plugins don't mark the module as modified anymore.
[Mod] Resized close dialog a bit.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_ins.cpp
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp	2011-08-09 14:22:45 UTC (rev 972)
+++ trunk/OpenMPT/mptrack/View_ins.cpp	2011-08-09 14:45:39 UTC (rev 973)
@@ -2118,10 +2118,10 @@
 
 	switch(event)
 	{
-		case 0x8: // Note Off
+		case MIDIEVENT_NOTEOFF: // Note Off
 			midiByte2 = 0;
 
-		case 0x9: // Note On
+		case MIDIEVENT_NOTEON: // Note On
 			pModDoc->NoteOff(nNote, FALSE, m_nInstrument);
 			if (midiByte2 & 0x7F)
 			{
@@ -2130,15 +2130,16 @@
 			}
 		break;
 
-		case 0xB: //Controller change
+		case MIDIEVENT_CONTROLLERCHANGE: //Controller change
 			switch(midiByte1)
 			{
 				case 0x7: //Volume
 					midivolume = midiByte2;
 				break;
 			}
+
 		default:
-			if(CMainFrame::GetSettings().m_dwMidiSetup & MIDISETUP_MIDITOPLUG && CMainFrame::GetMainFrame()->GetModPlaying() == pModDoc)
+			if((CMainFrame::GetSettings().m_dwMidiSetup & MIDISETUP_MIDITOPLUG) && CMainFrame::GetMainFrame()->GetModPlaying() == pModDoc)
 			{
 				const INSTRUMENTINDEX instr = m_nInstrument;
 				IMixPlugin* plug = pSndFile->GetInstrumentPlugin(instr);
@@ -2146,9 +2147,11 @@
 				{
 					plug->MidiSend(dwMidiData);
 					// Sending midi may modify the plug. For now, if MIDI data
-					// is not active sensing, set modified.
-					if(dwMidiData != MIDISTATUS_ACTIVESENSING)
+					// is not active sensing or aftertouch messages, set modified.
+					if(dwMidiData != MIDISTATUS_ACTIVESENSING && event != MIDIEVENT_POLYAFTERTOUCH && event != MIDIEVENT_CHANAFTERTOUCH)
+					{
 						CMainFrame::GetMainFrame()->ThreadSafeSetModified(pModDoc);
+					}
 				}
 			}
 		break;

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2011-08-09 14:22:45 UTC (rev 972)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2011-08-09 14:45:39 UTC (rev 973)
@@ -209,15 +209,15 @@
 END
 
 
-IDD_CLOSEDOCUMENTS DIALOGEX 0, 0, 370, 233
+IDD_CLOSEDOCUMENTS DIALOGEX 0, 0, 370, 197
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save modified files"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "&OK",IDOK,300,174,66,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,300,193,66,14
-    LISTBOX         IDC_LIST1,6,6,288,204,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Show &full paths",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,216,252,12
+    DEFPUSHBUTTON   "&OK",IDOK,300,138,66,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,300,157,66,14
+    LISTBOX         IDC_LIST1,6,6,288,168,LBS_SORT | LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Show &full paths",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,180,252,12
     PUSHBUTTON      "&Select none",IDC_BUTTON1,300,12,66,14
 END
 
@@ -315,7 +315,7 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 363
         TOPMARGIN, 7
-        BOTTOMMARGIN, 226
+        BOTTOMMARGIN, 190
     END
 END
 #endif    // APSTUDIO_INVOKED


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