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

[<man...@us...>]

Revision: 5028
          http://sourceforge.net/p/modplug/code/5028
Author:   manxorist
Date:     2015-04-30 18:11:20 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
[Ref] UNICODE build support in mptrack/Autotune.cpp.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Autotune.cpp
    trunk/OpenMPT/mptrack/Autotune.h

Modified: trunk/OpenMPT/mptrack/Autotune.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.cpp	2015-04-30 18:06:51 UTC (rev 5027)
+++ trunk/OpenMPT/mptrack/Autotune.cpp	2015-04-30 18:11:20 UTC (rev 5028)
@@ -162,10 +162,10 @@
 };
 
 
-DWORD WINAPI Autotune::AutotuneThread(void *i)
-//--------------------------------------------
+DWORD WINAPI Autotune::AutotuneThread(void *info_)
+//------------------------------------------------
 {
-	AutotuneThreadData &info = *static_cast<AutotuneThreadData *>(i);
+	AutotuneThreadData &info = *static_cast<AutotuneThreadData *>(info_);
 	info.histogram.resize(HISTORY_BINS, 0);
 #ifdef ENABLE_SSE2
 	const bool useSSE = (GetProcSupport() & PROCSUPPORT_SSE2) != 0;
@@ -360,7 +360,7 @@
 	m_CbnNoteBox.ResetContent();
 	for(int note = 0; note < 12; note++)
 	{
-		const int item = m_CbnNoteBox.AddString(szNoteNames[note]);
+		const int item = m_CbnNoteBox.AddString(mpt::ToCString(mpt::CharsetASCII, szNoteNames[note]));
 		m_CbnNoteBox.SetItemData(item, note);
 		if(note == targetNote)
 		{

Modified: trunk/OpenMPT/mptrack/Autotune.h
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.h	2015-04-30 18:06:51 UTC (rev 5027)
+++ trunk/OpenMPT/mptrack/Autotune.h	2015-04-30 18:11:20 UTC (rev 5028)
@@ -53,7 +53,7 @@
 
 	bool PrepareSample(SmpLength maxShift);
 
-	static DWORD WINAPI AutotuneThread(void *i);
+	static DWORD WINAPI AutotuneThread(void *info);
 };
 
 

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