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

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

Revision: 1189
          http://modplug.svn.sourceforge.net/modplug/?rev=1189&view=rev
Author:   saga-games
Date:     2012-02-24 22:30:17 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
[Fix] IT Compatibility: Vibrato direction in normal and Old FX mode was swapped.
[Imp] Instrument Editor: Duplicate Instrument also works for XM files now.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/soundlib/Sndmix.cpp
    trunk/OpenMPT/soundlib/modcommand.h

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2012-02-19 21:21:46 UTC (rev 1188)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2012-02-24 22:30:17 UTC (rev 1189)
@@ -1644,9 +1644,8 @@
 	if (m_pModDoc)
 	{
 		CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
-		if ((pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT))
-		 && (pSndFile->m_nInstruments > 0)
-		 && (CMainFrame::GetInputHandler()->ShiftPressed())) //rewbs.customKeys
+		if (pSndFile->m_nInstruments > 0
+			&& CMainFrame::GetInputHandler()->ShiftPressed()) //rewbs.customKeys
 		{
 			OnInstrumentDuplicate();
 			return;

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2012-02-19 21:21:46 UTC (rev 1188)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2012-02-24 22:30:17 UTC (rev 1189)
@@ -1213,7 +1213,7 @@
 		{
 			// Filter Envelope: controls cutoff frequency
 #ifndef NO_FILTER
-			SetupChannelFilter(pChn, (pChn->dwFlags & CHN_FILTER) ? false : true, envpitch);
+			SetupChannelFilter(pChn, !(pChn->dwFlags & CHN_FILTER), envpitch);
 #endif // NO_FILTER
 		} else
 		{
@@ -1563,8 +1563,10 @@
 			if(m_nTickCount + 1 == m_nMusicSpeed)
 				pChn->m_ReCalculateFreqOnFirstTick = true;
 		}
-		else //Original behavior
+		else
 		{
+			// Original behaviour
+
 			UINT vdepth;
 			// IT compatibility: correct vibrato depth
 			if(IsCompatibleMode(TRK_IMPULSETRACKER))
@@ -1572,11 +1574,13 @@
 				// Yes, vibrato goes backwards with old effects enabled!
 				if(m_dwSongFlags & SONG_ITOLDEFFECTS)
 				{
+					// Test case: vibrato-oldfx.it
 					vdepth = 5;
-					vdelta = -vdelta;
 				} else
 				{
+					// Test case: vibrato.it
 					vdepth = 6;
+					vdelta = -vdelta;
 				}
 			}
 			else

Modified: trunk/OpenMPT/soundlib/modcommand.h
===================================================================
--- trunk/OpenMPT/soundlib/modcommand.h	2012-02-19 21:21:46 UTC (rev 1188)
+++ trunk/OpenMPT/soundlib/modcommand.h	2012-02-24 22:30:17 UTC (rev 1189)
@@ -1,5 +1,3 @@
-#pragma once
-
 #ifndef MODCOMMAND_H
 #define MODCOMMAND_H
 
@@ -92,7 +90,6 @@
 	BYTE param;
 };
 
-typedef MODCOMMAND* LPMODCOMMAND;
 typedef MODCOMMAND MODCOMMAND_ORIGINAL;
 
 

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