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

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

Revision: 324
          http://modplug.svn.sourceforge.net/modplug/?rev=324&view=rev
Author:   saga-games
Date:     2009-08-15 15:09:25 +0000 (Sat, 15 Aug 2009)

Log Message:
-----------
[Imp] Mod Conversion: Tentative conversion of Param Control effects. The conversion is obviously not lossless.
[Fix] Pattern Editor: Apply Instrument to all notes won't affect Param Control and Note Fade.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2009-08-15 12:36:22 UTC (rev 323)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2009-08-15 15:09:25 UTC (rev 324)
@@ -186,8 +186,21 @@
 						m->param = min(m->param << 1, 0xFF);
 					}
 				}
-			}
+			} // End if(m->command == CMD_PANNING8)
 
+			//////////////////////////
+			// Convert param control
+			if(oldTypeIsMPT)
+			{
+				if(m->note == NOTE_PC || m->note == NOTE_PCS)
+				{
+					m->param = min(MODCOMMAND::maxColumnValue, m->GetValueEffectCol()) * 0x7F / MODCOMMAND::maxColumnValue;
+					m->command = (m->note == NOTE_PC) ? CMD_MIDI : CMD_SMOOTHMIDI;
+					m->volcmd = VOLCMD_NONE;
+					m->note = NOTE_NONE;
+				}
+			} // End if(oldTypeIsMPT)
+
 			/////////////////////////////////////////
 			// Convert MOD / XM to S3M / IT / MPTM
 			if(oldTypeIsMOD_XM && newTypeIsS3M_IT_MPT)

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2009-08-15 12:36:22 UTC (rev 323)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2009-08-15 15:09:25 UTC (rev 324)
@@ -2486,7 +2486,7 @@
 			p = pSndFile->Patterns[m_nPattern] + r * pSndFile->m_nChannels + c;
 			// If a note or an instr is present on the row, do the change, if required.
 			// Do not set instr if note and instr are both blank.
-			if ( ((p->note > 0 && p->note < NOTE_NOTECUT) ||p->instr) && (p->instr!=nIns) ) {
+			if ( ((p->note > 0 && p->note < NOTE_MIN_SPECIAL) ||p->instr) && (p->instr!=nIns) ) {
 				p->instr = nIns;
 				bModified = TRUE;
 			}


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