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

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

Revision: 354
          http://modplug.svn.sourceforge.net/modplug/?rev=354&view=rev
Author:   saga-games
Date:     2009-09-06 16:09:09 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
[Fix] Rearrange Samples: Sample names were copied to the mod title (again...)
[Fix] Treeview: Playing sounds from a soundfont was broken

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Moddoc.h
    trunk/OpenMPT/mptrack/Modedit.cpp

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2009-09-06 12:45:07 UTC (rev 353)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2009-09-06 16:09:09 UTC (rev 354)
@@ -2008,6 +2008,7 @@
 	m_WaveFile.m_nChannels = 4;
 	m_WaveFile.m_nInstruments = 1;
 	m_WaveFile.m_nSamples = 1;
+	m_WaveFile.Order.resize(3);
 	m_WaveFile.Order[0] = 0;
 	m_WaveFile.Order[1] = 1;
 	m_WaveFile.Order[2] = m_WaveFile.Order.GetInvalidPatIndex();

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2009-09-06 12:45:07 UTC (rev 353)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2009-09-06 16:09:09 UTC (rev 354)
@@ -62,7 +62,7 @@
 	ON_COMMAND(ID_INSTRUMENTS_REMOVEALL,OnRemoveAllInstruments)
 // -> CODE#0020
 // -> DESC="rearrange sample list"
-	ON_COMMAND(ID_REARRANGE_SAMPLES,	RearrangeSampleList)
+	ON_COMMAND(ID_REARRANGE_SAMPLES,	RearrangeSamples)
 // -! NEW_FEATURE#0020
 	ON_COMMAND(ID_ESTIMATESONGLENGTH,	OnEstimateSongLength)
 	ON_COMMAND(ID_APPROX_BPM,			OnApproximateBPM)
@@ -1641,7 +1641,7 @@
 			::MessageBox(NULL,"Warning: the exported file will not contain any of MPT's file-format hacks.", "Compatibility export warning.",MB_ICONINFORMATION | MB_OK);
 			break;
 		default:
-			::MessageBox(NULL,"Compatibility export is currently only available for MOD and IT modules.", "Can't do compatibility export.",MB_ICONINFORMATION | MB_OK);
+			::MessageBox(NULL,"Compatibility export is currently only available for MOD, XM and IT modules.", "Can't do compatibility export.",MB_ICONINFORMATION | MB_OK);
 			return;
 	}
 

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h	2009-09-06 12:45:07 UTC (rev 353)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2009-09-06 16:09:09 UTC (rev 354)
@@ -194,7 +194,7 @@
 	BOOL RemoveUnusedPlugs();
 	UINT RemovePlugs(const bool (&keepMask)[MAX_MIXPLUGINS]);
 	BOOL RemoveUnusedPatterns(BOOL bRemove=TRUE);
-	void RearrangeSampleList();
+	void RearrangeSamples();
 	BOOL CompoCleanup();
 
 	PATTERNINDEX InsertPattern(ORDERINDEX nOrd = -1, ROWINDEX nRows = 64);

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2009-09-06 12:45:07 UTC (rev 353)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2009-09-06 16:09:09 UTC (rev 354)
@@ -1067,8 +1067,8 @@
 
 
 
-void CModDoc::RearrangeSampleList()
-//---------------------------------
+void CModDoc::RearrangeSamples()
+//------------------------------
 {
 	if(m_SndFile.m_nSamples < 2)
 		return;
@@ -1103,7 +1103,7 @@
 			// This gotta be moved
 			m_SndFile.MoveSample(i, nSampleMap[i]);
 			m_SndFile.Samples[i].pSample = nullptr;
-			strcpy(m_SndFile.m_szNames[nSampleMap[i]], m_SndFile.m_szNames[i]);
+			if(nSampleMap[i] > 0) strcpy(m_SndFile.m_szNames[nSampleMap[i]], m_SndFile.m_szNames[i]);
 			memset(m_SndFile.m_szNames[i], 0, sizeof(m_SndFile.m_szNames[i]));
 
 			// Also update instrument mapping (if module is in instrument mode)


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