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

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

Revision: 4029
          http://sourceforge.net/p/modplug/code/4029
Author:   saga-games
Date:     2014-05-02 19:02:48 +0000 (Fri, 02 May 2014)
Log Message:
-----------
[Fix] Adding silence to a sample that's not 8-bit mono broke in OpenMPT 1.23
[Fix] The player settings button on the general tab broke when changing to CHM help code.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_gen.cpp
    trunk/OpenMPT/soundlib/modsmp_ctrl.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp	2014-05-01 22:59:06 UTC (rev 4028)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp	2014-05-02 19:02:48 UTC (rev 4029)
@@ -535,7 +535,7 @@
 void CCtrlGeneral::OnPlayerProperties()
 //-------------------------------------
 {
-	CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_PLAYER;
+	CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_MIXER;
 	CMainFrame::GetMainFrame()->OnViewOptions();
 }
 

Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2014-05-01 22:59:06 UTC (rev 4028)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp	2014-05-02 19:02:48 UTC (rev 4029)
@@ -65,7 +65,7 @@
 		}
 		if(nStartFrom < smp.nLength)
 		{
-			memcpy(pNewSmp + silenceOffset + silenceBytes, static_cast<const char *>(smp.pSample) + silenceOffset, smp.nLength - silenceOffset);
+			memcpy(pNewSmp + silenceOffset + silenceBytes, static_cast<const char *>(smp.pSample) + silenceOffset, smp.GetSampleSizeInBytes() - silenceOffset);
 		}
 
 		// Update loop points if necessary.

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