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

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

Revision: 1157
          http://modplug.svn.sourceforge.net/modplug/?rev=1157&view=rev
Author:   saga-games
Date:     2012-01-03 19:06:22 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
[Imp] Instrument Editor: Added tooltip for the MIDI Channel control
[Fix] Playing notes from the editor broke in some cases in the previous revision.

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

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2012-01-03 18:26:14 UTC (rev 1156)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2012-01-03 19:06:22 UTC (rev 1157)
@@ -1557,33 +1557,39 @@
 		{
 		case IDC_EDIT_PITCHTEMPOLOCK:
 		case IDC_CHECK_PITCHTEMPOLOCK:
+			// Pitch/Tempo lock
 			{
-			const CModSpecifications& specs = m_pSndFile->GetModSpecifications();
-			string str = string("Tempo range: ") + Stringify(specs.tempoMin) + string(" - ") + Stringify(specs.tempoMax);
-			if(str.size() >= 250) str.resize(250);
-			wsprintf(pszText, str.c_str());
-			return TRUE;
-			break;
+				const CModSpecifications& specs = m_pSndFile->GetModSpecifications();
+				string str = string("Tempo range: ") + Stringify(specs.tempoMin) + string(" - ") + Stringify(specs.tempoMax);
+				if(str.size() >= 250) str.resize(250);
+				strcpy(pszText, str.c_str());
+				return TRUE;
 			}
-		case IDC_EDIT7: //Fade out
+
+		case IDC_EDIT7:
+			// Fade Out
 			wsprintf(pszText, "Higher value <-> Faster fade out");
 			return TRUE;
-			break;
 
 		case IDC_PLUGIN_VELOCITYSTYLE:
 		case IDC_PLUGIN_VOLUMESTYLE:
+			// Plugin volume handling
 			if(m_pSndFile->Instruments[m_nInstrument]->nMixPlug < 1) return FALSE;
 			if(m_pSndFile->GetModFlag(MSF_MIDICC_BUGEMULATION))
 			{
 				m_CbnPluginVelocityHandling.EnableWindow(FALSE);
 				m_CbnPluginVolumeHandling.EnableWindow(FALSE);
-				wsprintf(pszText, "To enable, clear Plugin volume command bug emulation flag from Song Properties");
+				strcpy(pszText, "To enable, clear Plugin volume command bug emulation flag from Song Properties");
 				return TRUE;
 			}
 			else
 				return FALSE;
-			
-			break;
+
+		case IDC_COMBO5:
+			// MIDI Channel
+			strcpy(pszText, "Mapped: MIDI channel corresponds to pattern channel modulo 16");
+			return TRUE;
+
 		}
 	}
 	return FALSE;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2012-01-03 18:26:14 UTC (rev 1156)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2012-01-03 19:06:22 UTC (rev 1157)
@@ -924,10 +924,10 @@
 		CriticalSection cs;
 
 		//find a channel if required
-		/* if (nCurrentChn == CHANNELINDEX_INVALID)
+		//if (nCurrentChn == CHANNELINDEX_INVALID)
 		{ 
 			nChn = FindAvailableChannel();
-		} */
+		}
 
 		MODCHANNEL *pChn = &m_SndFile.Chn[nChn];
 		

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