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

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

Revision: 200
          http://modplug.svn.sourceforge.net/modplug/?rev=200&view=rev
Author:   relabsoluness
Date:     2008-02-02 11:03:19 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
. Extended song/instrument properties were not always loaded correctly for IT(http://lpchip.com/modplug/viewtopic.php?p=16335)
. Channel pan controls in general view were disable for all types instead of just XM and MOD (bug introduced in rev. 199)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_gen.cpp
    trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/mptrack/View_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp	2008-01-29 21:00:25 UTC (rev 199)
+++ trunk/OpenMPT/mptrack/View_gen.cpp	2008-02-02 19:03:19 UTC (rev 200)
@@ -390,11 +390,11 @@
 			::EnableWindow(::GetDlgItem(m_hWnd, IDC_CHECK1+ichn*2), bEnable);
 			::EnableWindow(::GetDlgItem(m_hWnd, IDC_CHECK2+ichn*2), bIT);
 			::EnableWindow(m_sbVolume[ichn].m_hWnd, bEnable);
-			::EnableWindow(m_sbPan[ichn].m_hWnd, bEnable && !(pSndFile->GetType() & MOD_TYPE_XM|MOD_TYPE_MOD));
+			::EnableWindow(m_sbPan[ichn].m_hWnd, bEnable && !(pSndFile->GetType() & (MOD_TYPE_XM|MOD_TYPE_MOD)));
 			::EnableWindow(m_spinVolume[ichn], bEnable);
-			::EnableWindow(m_spinPan[ichn], bEnable && !(pSndFile->GetType() & MOD_TYPE_XM|MOD_TYPE_MOD));
+			::EnableWindow(m_spinPan[ichn], bEnable && !(pSndFile->GetType() & (MOD_TYPE_XM|MOD_TYPE_MOD)));
 			::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT1+ichn*2), bEnable);
-			::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT2+ichn*2), bEnable && !(pSndFile->GetType() & MOD_TYPE_XM|MOD_TYPE_MOD));
+			::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT2+ichn*2), bEnable && !(pSndFile->GetType() & (MOD_TYPE_XM|MOD_TYPE_MOD)));
 			::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT9+ichn), ((bEnable) && (pSndFile->m_nType & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT))));
 			m_CbnEffects[ichn].EnableWindow(bEnable);
 		}

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2008-01-29 21:00:25 UTC (rev 199)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2008-02-02 19:03:19 UTC (rev 200)
@@ -958,6 +958,8 @@
 		}
 	}
 	
+	if(GetType() == MOD_TYPE_IT) mptStartPos = dwMemLength;
+
 	if (pifh->flags & 0x08) m_dwSongFlags |= SONG_LINEARSLIDES;
 	if (pifh->flags & 0x10) m_dwSongFlags |= SONG_ITOLDEFFECTS;
 	if (pifh->flags & 0x20) m_dwSongFlags |= SONG_ITCOMPATMODE;


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