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

[<rel...@us...>]

Revision: 198
          http://modplug.svn.sourceforge.net/modplug/?rev=198&view=rev
Author:   relabsoluness
Date:     2008-01-26 12:02:01 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
1.17.02.50
. Few improvements in the volume command handling for plugs

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/bin/mptrack.exe
    trunk/OpenMPT/mptrack/dlg_misc.cpp
    trunk/OpenMPT/mptrack/mptrack.rc
    trunk/OpenMPT/soundlib/Load_xm.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/mptrack/bin/mptrack.exe
===================================================================
(Binary files differ)

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	2008-01-19 16:37:43 UTC (rev 197)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	2008-01-26 20:02:01 UTC (rev 198)
@@ -276,8 +276,8 @@
 	{
 		p->ShowWindow(XMorITorMPT);
 		if(ITorMPT)
-            p->SetWindowText("0: True to use various IT compatible playback changes\n"
-							 "1: True for old instrument random variation behavior\n"
+            p->SetWindowText("0: Various playback changes for IT compatibility\n"
+							 "1: Old instrument random variation behavior\n"
 							 "2: Plugin volume command bug emulation");
 		else if(XM) p->SetWindowText("0: Unused\n1: Unused\n2: Plugin volume command bug emulation");
 	}

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2008-01-19 16:37:43 UTC (rev 197)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2008-01-26 20:02:01 UTC (rev 198)
@@ -916,8 +916,8 @@
     RTEXT           "--",IDC_TEXT1,204,62,27,8
     GROUPBOX        "Pitch/Tempo Lock",IDC_STATIC,364,57,89,25
     GROUPBOX        "Sample Map",IDC_STATIC,461,27,62,141
-    CTEXT           "Note Velocity style",IDC_STATIC,374,101,77,10,
-                    SS_CENTERIMAGE,WS_EX_STATICEDGE
+    CTEXT           "Note Velocity",IDC_STATIC,374,101,77,10,SS_CENTERIMAGE,
+                    WS_EX_STATICEDGE
     CTEXT           "Volume command effect",IDC_STATIC,374,133,77,10,
                     SS_CENTERIMAGE,WS_EX_STATICEDGE
     GROUPBOX        "Tuning (experimental)",IDC_STATIC,364,28,92,28

Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp	2008-01-19 16:37:43 UTC (rev 197)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp	2008-01-26 20:02:01 UTC (rev 198)
@@ -300,7 +300,7 @@
 		memset(Headers[iIns], 0, sizeof(INSTRUMENTHEADER));
 		Headers[iIns]->pTuning = m_defaultInstrument.pTuning;
 		Headers[iIns]->nPluginVelocityHandling = PLUGIN_VELOCITYHANDLING_CHANNEL;
-		Headers[iIns]->nPluginVolumeHandling = PLUGIN_VOLUMEHANDLING_MIDI;
+		Headers[iIns]->nPluginVolumeHandling = PLUGIN_VOLUMEHANDLING_IGNORE;
 
 		memcpy(Headers[iIns]->name, pih->name, 22);
 		if ((nsamples = pih->samples) > 0)

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2008-01-19 16:37:43 UTC (rev 197)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2008-01-26 20:02:01 UTC (rev 198)
@@ -2736,7 +2736,7 @@
 	m_defaultInstrument.nVolEnvReleaseNode=ENV_RELEASE_NODE_UNSET;
 	m_defaultInstrument.wPitchToTempoLock = 0;
 	m_defaultInstrument.pTuning = m_defaultInstrument.s_DefaultTuning;
-	m_defaultInstrument.nPluginVelocityHandling = PLUGIN_VELOCITYHANDLING_VOLUME;
+	m_defaultInstrument.nPluginVelocityHandling = PLUGIN_VELOCITYHANDLING_CHANNEL;
 	m_defaultInstrument.nPluginVolumeHandling = PLUGIN_VOLUMEHANDLING_DRYWET;
 }
 


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