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

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

Revision: 4244
          http://sourceforge.net/p/modplug/code/4244
Author:   saga-games
Date:     2014-09-06 23:50:34 +0000 (Sat, 06 Sep 2014)
Log Message:
-----------
[Mod] Disallow "attack" setting to be used in IT and XM files.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/soundlib/ModInstrument.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2014-09-06 13:17:05 UTC (rev 4243)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2014-09-06 23:50:34 UTC (rev 4244)
@@ -1168,8 +1168,8 @@
 		::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT10), bITandXM);
 		::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT11), bITandXM);
 		::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT7), bITandXM);
-		::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT2), bITandXM);
-		m_SliderAttack.EnableWindow(bITandXM);
+		::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT2), bMPTOnly || (pIns && pIns->nVolRampUp));
+		m_SliderAttack.EnableWindow(bMPTOnly || (pIns && pIns->nVolRampUp));	// For legacy modules, keep the attack setting enabled. Otherwise, only allow it in MPTM files.
 		m_EditName.EnableWindow(bITandXM);
 		m_EditFileName.EnableWindow(bITandMPT);
 		m_CbnMidiCh.EnableWindow(bITandXM);

Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp	2014-09-06 13:17:05 UTC (rev 4243)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp	2014-09-06 23:50:34 UTC (rev 4244)
@@ -227,6 +227,7 @@
 		wPitchToTempoLock = 0;
 		nCutSwing = nResSwing = 0;
 		nFilterMode = FLTMODE_UNCHANGED;
+		nVolRampUp = 0;
 	}
 }
 

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