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

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

Revision: 3933
          http://sourceforge.net/p/modplug/code/3933
Author:   manxorist
Date:     2014-03-22 15:45:04 +0000 (Sat, 22 Mar 2014)
Log Message:
-----------
[Ref] Small header dependencies cleanup.

Modified Paths:
--------------
    trunk/OpenMPT/common/misc_util.cpp
    trunk/OpenMPT/common/stdafx.h
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
    trunk/OpenMPT/sounddev/SoundDevice.cpp
    trunk/OpenMPT/sounddev/SoundDevice.h
    trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
    trunk/OpenMPT/sounddev/SoundDeviceThread.cpp
    trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp

Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/common/misc_util.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -23,6 +23,9 @@
 #endif
 #endif
 
+#if defined(MODPLUG_TRACKER)
+#include <mmsystem.h>
+#endif
 
 
 template<typename T>

Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/common/stdafx.h	2014-03-22 15:45:04 UTC (rev 3933)
@@ -28,23 +28,13 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <shlwapi.h>
-
-#if MPT_COMPILER_MSVC
-#pragma warning(disable:4201)
-#endif
 #include <mmsystem.h>
-#include <mmreg.h>
-#include <msacm.h>
-#if MPT_COMPILER_MSVC
-#pragma warning(default:4201)
-#endif
 
 #endif // MODPLUG_TRACKER
 
 
 #ifndef NO_PCH
 
-#include <string>
 #include <vector>
 
 #endif // NO_PCH

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -30,7 +30,6 @@
 #include "MemoryMappedFile.h"
 #include "../soundlib/FileReader.h"
 #include "../soundlib/SampleFormatConverters.h"
-#include <Shlwapi.h>
 #include "FileDialog.h"
 
 #ifdef _DEBUG

Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -58,7 +58,8 @@
 #endif // MPT_MP3ENCODER_BLADE
 
 #ifdef MPT_MP3ENCODER_ACM
-#include <MSAcm.h>
+#include <mmreg.h>
+#include <msacm.h>
 #endif // MPT_MP3ENCODER_ACM
 
 

Modified: trunk/OpenMPT/sounddev/SoundDevice.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/sounddev/SoundDevice.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -24,7 +24,9 @@
 #include <algorithm>
 #include <iterator>
 
+#include <mmreg.h>
 
+
 std::wstring SoundDeviceTypeToString(SoundDeviceType type)
 //--------------------------------------------------------
 {
@@ -164,8 +166,8 @@
 }
 
 
-bool ISoundDevice::FillWaveFormatExtensible(WAVEFORMATEXTENSIBLE &WaveFormat)
-//---------------------------------------------------------------------------
+bool FillWaveFormatExtensible(WAVEFORMATEXTENSIBLE &WaveFormat, const SoundDeviceSettings &m_Settings)
+//----------------------------------------------------------------------------------------------------
 {
 	MemsetZero(WaveFormat);
 	if(!m_Settings.sampleFormat.IsValid()) return false;

Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/sounddev/SoundDevice.h	2014-03-22 15:45:04 UTC (rev 3933)
@@ -438,8 +438,6 @@
 
 protected:
 
-	bool FillWaveFormatExtensible(WAVEFORMATEXTENSIBLE &WaveFormat);
-
 	const Util::MultimediaClock & Clock() const { return m_Clock; }
 
 	void UpdateBufferAttributes(SoundBufferAttributes attributes);

Modified: trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -19,7 +19,12 @@
 #include "../common/misc_util.h"
 #include "../common/StringFixer.h"
 
+#include <mmreg.h>
 
+
+bool FillWaveFormatExtensible(WAVEFORMATEXTENSIBLE &WaveFormat, const SoundDeviceSettings &m_Settings);
+
+
 ////////////////////////////////////////////////////////////////////////////////////
 //
 // DirectSound device
@@ -182,7 +187,7 @@
 //--------------------------------
 {
 	WAVEFORMATEXTENSIBLE wfext;
-	if(!FillWaveFormatExtensible(wfext)) return false;
+	if(!FillWaveFormatExtensible(wfext, m_Settings)) return false;
 	WAVEFORMATEX *pwfx = &wfext.Format;
 
 	const std::size_t bytesPerFrame = m_Settings.GetBytesPerFrame();

Modified: trunk/OpenMPT/sounddev/SoundDeviceThread.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceThread.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/sounddev/SoundDeviceThread.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -19,7 +19,9 @@
 #include <algorithm>
 #include <iterator>
 
+#include <mmsystem.h>
 
+
 CAudioThread::CAudioThread(CSoundDeviceWithThread &SoundDevice) : m_SoundDevice(SoundDevice)
 //------------------------------------------------------------------------------------------
 {

Modified: trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp	2014-03-22 10:16:47 UTC (rev 3932)
+++ trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp	2014-03-22 15:45:04 UTC (rev 3933)
@@ -18,7 +18,12 @@
 
 #include "../common/misc_util.h"
 
+#include <mmreg.h>
 
+
+bool FillWaveFormatExtensible(WAVEFORMATEXTENSIBLE &WaveFormat, const SoundDeviceSettings &m_Settings);
+
+
 ///////////////////////////////////////////////////////////////////////////////////////
 //
 // MMSYSTEM WaveOut Device
@@ -54,7 +59,7 @@
 //------------------------------
 {
 	WAVEFORMATEXTENSIBLE wfext;
-	if(!FillWaveFormatExtensible(wfext))
+	if(!FillWaveFormatExtensible(wfext, m_Settings))
 	{
 		return false;
 	}

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