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

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

Revision: 2632
          http://sourceforge.net/p/modplug/code/2632
Author:   manxorist
Date:     2013-09-03 19:15:19 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
[Ref] Small type cleanups.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/sounddev/SoundDevice.h
    trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
    trunk/OpenMPT/sounddev/SoundDeviceASIO.h
    trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
    trunk/OpenMPT/sounddev/SoundDevicePortAudio.h

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2013-09-03 16:04:23 UTC (rev 2631)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2013-09-03 19:15:19 UTC (rev 2632)
@@ -410,7 +410,7 @@
 	m_CbnMixingFreq.ResetContent();
 
 	std::vector<bool> supportedRates;
-	std::vector<UINT> samplerates;
+	std::vector<uint32> samplerates;
 	for(size_t i = 0; i < CountOf(nMixingRates); i++)
 	{
 		samplerates.push_back(nMixingRates[i]);

Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h	2013-09-03 16:04:23 UTC (rev 2631)
+++ trunk/OpenMPT/sounddev/SoundDevice.h	2013-09-03 19:15:19 UTC (rev 2632)
@@ -168,7 +168,7 @@
 	virtual int64 GetStreamPositionSamples() const { return 0; }
 	virtual UINT GetCurrentSampleRate(UINT nDevice) { UNREFERENCED_PARAMETER(nDevice); return 0; }
 	// Return which samplerates are actually supported by the device. Currently only implemented properly for ASIO.
-	virtual bool CanSampleRate(UINT nDevice, std::vector<UINT> &samplerates, std::vector<bool> &result) { UNREFERENCED_PARAMETER(nDevice); result.assign(samplerates.size(), true); return true; } ;
+	virtual bool CanSampleRate(UINT nDevice, std::vector<uint32> &samplerates, std::vector<bool> &result) { UNREFERENCED_PARAMETER(nDevice); result.assign(samplerates.size(), true); return true; } ;
 };
 
 

Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp	2013-09-03 16:04:23 UTC (rev 2631)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp	2013-09-03 19:15:19 UTC (rev 2632)
@@ -702,8 +702,8 @@
 }
 
 
-bool CASIODevice::CanSampleRate(UINT nDevice, std::vector<UINT> &samplerates, std::vector<bool> &result)
-//------------------------------------------------------------------------------------------------------
+bool CASIODevice::CanSampleRate(UINT nDevice, std::vector<uint32> &samplerates, std::vector<bool> &result)
+//-------------------------------------------------------------------------------------------------------
 {
 	const bool wasOpen = (m_pAsioDrv != NULL);
 	if(!wasOpen)

Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.h	2013-09-03 16:04:23 UTC (rev 2631)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.h	2013-09-03 19:15:19 UTC (rev 2632)
@@ -68,7 +68,7 @@
 	UINT GetNumBuffers() { return 2; }
 	float GetCurrentRealLatencyMS() { return m_nAsioBufferLen * 2 * 1000.0f / m_Settings.Samplerate; }
 
-	bool CanSampleRate(UINT nDevice, std::vector<UINT> &samplerates, std::vector<bool> &result);
+	bool CanSampleRate(UINT nDevice, std::vector<uint32> &samplerates, std::vector<bool> &result);
 	UINT GetCurrentSampleRate(UINT nDevice);
 
 public:

Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp	2013-09-03 16:04:23 UTC (rev 2631)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp	2013-09-03 19:15:19 UTC (rev 2632)
@@ -159,8 +159,8 @@
 }
 
 
-bool CPortaudioDevice::CanSampleRate(UINT nDevice, std::vector<UINT> &samplerates, std::vector<bool> &result)
-//-----------------------------------------------------------------------------------------------------------
+bool CPortaudioDevice::CanSampleRate(UINT nDevice, std::vector<uint32> &samplerates, std::vector<bool> &result)
+//------------------------------------------------------------------------------------------------------------
 {
 	result.clear();
 	for(UINT n=0; n<samplerates.size(); n++)

Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.h	2013-09-03 16:04:23 UTC (rev 2631)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.h	2013-09-03 19:15:19 UTC (rev 2632)
@@ -57,7 +57,7 @@
 	float GetCurrentRealLatencyMS();
 	bool HasGetStreamPosition() const { return false; }
 	int64 GetStreamPositionSamples() const;
-	bool CanSampleRate(UINT nDevice, std::vector<UINT> &samplerates, std::vector<bool> &result);
+	bool CanSampleRate(UINT nDevice, std::vector<uint32> &samplerates, std::vector<bool> &result);
 
 	int StreamCallback(
 		const void *input, void *output,

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