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

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

Revision: 4065
          http://sourceforge.net/p/modplug/code/4065
Author:   manxorist
Date:     2014-05-26 13:02:31 +0000 (Mon, 26 May 2014)
Log Message:
-----------
[Ref] Silence 2 64bit warnings.

Modified Paths:
--------------
    trunk/OpenMPT/common/misc_util.cpp
    trunk/OpenMPT/sounddev/SoundDevice.cpp

Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp	2014-05-26 08:10:52 UTC (rev 4064)
+++ trunk/OpenMPT/common/misc_util.cpp	2014-05-26 13:02:31 UTC (rev 4065)
@@ -417,7 +417,7 @@
 //----------------------------------
 {
 	std::vector<OLECHAR> tmp(256);
-	::StringFromGUID2(guid, &tmp[0], tmp.size());
+	::StringFromGUID2(guid, &tmp[0], static_cast<int>(tmp.size()));
 	return &tmp[0];
 }
 

Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.cpp	2014-05-26 08:10:52 UTC (rev 4064)
+++ trunk/OpenMPT/sounddev/SoundDevice.cpp	2014-05-26 13:02:31 UTC (rev 4065)
@@ -174,7 +174,7 @@
 	WaveFormat.Format.wFormatTag = m_Settings.sampleFormat.IsFloat() ? WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM;
 	WaveFormat.Format.nChannels = (WORD)m_Settings.Channels;
 	WaveFormat.Format.nSamplesPerSec = m_Settings.Samplerate;
-	WaveFormat.Format.nAvgBytesPerSec = m_Settings.GetBytesPerSecond();
+	WaveFormat.Format.nAvgBytesPerSec = (DWORD)m_Settings.GetBytesPerSecond();
 	WaveFormat.Format.nBlockAlign = (WORD)m_Settings.GetBytesPerFrame();
 	WaveFormat.Format.wBitsPerSample = (WORD)m_Settings.sampleFormat.GetBitsPerSample();
 	WaveFormat.Format.cbSize = 0;

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