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

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

Revision: 3734
          http://sourceforge.net/p/modplug/code/3734
Author:   saga-games
Date:     2014-02-18 18:55:50 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
[Fix] Error message when (new) soundtouch dll is missing was outdated.
[Fix] Time stretching parameter tooltip text was outdated.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2014-02-18 18:42:29 UTC (rev 3733)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2014-02-18 18:55:50 UTC (rev 3734)
@@ -545,7 +545,7 @@
 			}
 			break;
 		case IDC_EDIT_STRETCHPARAMS:
-			wsprintf(pszText, "SequenceMs SeekwindowMs OverlapMs ProcessStepLength");
+			wsprintf(pszText, "SequenceMs SeekwindowMs OverlapMs");
 			return TRUE;
 		}
 	}
@@ -1490,7 +1490,7 @@
 		if (sample.uFlags[CHN_16BIT])
 		{
 			if (dwStart > 0) memcpy(pNewSample, pOriginal, dwStart*smplsize);
-			if (dwEnd < sample.nLength) memcpy(((LPSTR)pNewSample)+(dwStart+(dwEnd-dwStart)*2)*smplsize, ((LPSTR)pOriginal)+(dwEnd*smplsize), (sample.nLength-dwEnd)*smplsize);
+			if (dwEnd < sample.nLength) memcpy(((int8 *)pNewSample)+(dwStart+(dwEnd-dwStart)*2)*smplsize, ((int8 *)pOriginal)+(dwEnd*smplsize), (sample.nLength-dwEnd)*smplsize);
 		} else
 		{
 			if (dwStart > 0)
@@ -1519,7 +1519,7 @@
 		if (sample.nSustainEnd > dwStart) sample.nSustainEnd += (sample.nSustainEnd - dwStart);
 		
 		sample.uFlags.set(CHN_16BIT);
-		ctrlSmp::ReplaceSample(sample, (LPSTR)pNewSample, dwNewLen, m_sndFile);
+		ctrlSmp::ReplaceSample(sample, pNewSample, dwNewLen, m_sndFile);
 		// Update loop wrap-around buffer
 		sample.PrecomputeLoops(m_sndFile);
 		
@@ -1623,7 +1623,7 @@
 			}
 		}
 		if (dwStart > 0) memcpy(pNewSample, pOriginal, dwStart*smplsize);
-		if (dwEnd < sample.nLength) memcpy(((LPSTR)pNewSample)+(dwStart+dwRemove)*smplsize, ((LPSTR)pOriginal)+((dwStart+dwRemove*2)*smplsize), (sample.nLength-dwEnd)*smplsize);
+		if (dwEnd < sample.nLength) memcpy(((int8 *)pNewSample)+(dwStart+dwRemove)*smplsize, ((int8 *)pOriginal)+((dwStart+dwRemove*2)*smplsize), (sample.nLength-dwEnd)*smplsize);
 		if (sample.nLoopStart >= dwEnd) sample.nLoopStart -= dwRemove; else
 		if (sample.nLoopStart > dwStart) sample.nLoopStart -= (sample.nLoopStart - dwStart)/2;
 		if (sample.nLoopEnd >= dwEnd) sample.nLoopEnd -= dwRemove; else
@@ -1635,7 +1635,7 @@
 		if (sample.nSustainEnd > dwStart) sample.nSustainEnd -= (sample.nSustainEnd - dwStart)/2;
 		if (sample.nSustainEnd > dwNewLen) sample.nSustainEnd = dwNewLen;
 
-		ctrlSmp::ReplaceSample(sample, (LPSTR)pNewSample, dwNewLen, m_sndFile);
+		ctrlSmp::ReplaceSample(sample, pNewSample, dwNewLen, m_sndFile);
 		// Update loop wrap-around buffer
 		sample.PrecomputeLoops(m_sndFile);
 
@@ -2044,7 +2044,7 @@
 
 	m_modDoc.GetSampleUndo().PrepareUndo(m_nSample, sundo_replace, "Time Stretch");
 	// Swap sample buffer pointer to new buffer, update song + sample data & free old sample buffer
-	ctrlSmp::ReplaceSample(sample, (LPSTR)pNewSample, std::min(outPos, nNewSampleLength), m_sndFile);
+	ctrlSmp::ReplaceSample(sample, pNewSample, std::min(outPos, nNewSampleLength), m_sndFile);
 
 	// Free progress bar brushes
 	DeleteObject((HBRUSH)green);

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2014-02-18 18:42:29 UTC (rev 3733)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2014-02-18 18:55:50 UTC (rev 3734)
@@ -2104,7 +2104,7 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SOUNDTOUCH_LOADFAILURE "Unable to load OpenMPT_soundtouch_i16.dll."
+    IDS_SOUNDTOUCH_LOADFAILURE "Unable to load OpenMPT_soundtouch_f32.dll."
     IDS_ERR_FILEOPEN        "Unable to open file."
     IDS_ERR_FILETYPE        "Unsupported file type"
     IDS_ERR_SAVEINS         "Unable to save instrument"
@@ -2165,26 +2165,6 @@
 
 STRINGTABLE
 BEGIN
-    ID_FILE_MRU_FILE1       "Open this document"
-    ID_FILE_MRU_FILE2       "Open this document"
-    ID_FILE_MRU_FILE3       "Open this document"
-    ID_FILE_MRU_FILE4       "Open this document"
-    ID_FILE_MRU_FILE5       "Open this document"
-    ID_FILE_MRU_FILE6       "Open this document"
-    ID_FILE_MRU_FILE7       "Open this document"
-    ID_FILE_MRU_FILE8       "Open this document"
-    ID_FILE_MRU_FILE9       "Open this document"
-    ID_FILE_MRU_FILE10      "Open this document"
-    ID_FILE_MRU_FILE11      "Open this document"
-    ID_FILE_MRU_FILE12      "Open this document"
-    ID_FILE_MRU_FILE13      "Open this document"
-    ID_FILE_MRU_FILE14      "Open this document"
-    ID_FILE_MRU_FILE15      "Open this document"
-    ID_FILE_MRU_FILE16      "Open this document"
-END
-
-STRINGTABLE
-BEGIN
     ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END

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