Common: Remove other Common prefixed headers from Common.h

This commit is contained in:
Lioncash 2015-09-26 17:13:07 -04:00
parent 19ac565e0d
commit cc036ca86c
62 changed files with 107 additions and 32 deletions

View File

@ -6,6 +6,8 @@
#include "AudioCommon/AOSoundStream.h"
#include "AudioCommon/Mixer.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#if defined(HAVE_AO) && HAVE_AO

View File

@ -7,6 +7,7 @@
#include "AudioCommon/AlsaSoundStream.h"
#include "Common/CommonTypes.h"
#include "Common/Thread.h"
#include "Common/Logging/Log.h"
#define FRAME_COUNT_MIN 256
#define BUFFER_SIZE_MAX 8192

View File

@ -14,9 +14,9 @@
#include "AudioCommon/PulseAudioStream.h"
#include "AudioCommon/XAudio2_7Stream.h"
#include "AudioCommon/XAudio2Stream.h"
#include "Common/FileUtil.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#include "Core/Movie.h"

View File

@ -5,6 +5,7 @@
#include <CoreServices/CoreServices.h>
#include "AudioCommon/CoreAudioSoundStream.h"
#include "Common/Logging/Log.h"
OSStatus CoreAudioSound::callback(void *inRefCon,
AudioUnitRenderActionFlags *ioActionFlags,

View File

@ -18,6 +18,18 @@
#include <tmmintrin.h>
#endif
CMixer::CMixer(unsigned int BackendSampleRate)
: m_dma_mixer(this, 32000)
, m_streaming_mixer(this, 48000)
, m_wiimote_speaker_mixer(this, 3000)
, m_sampleRate(BackendSampleRate)
, m_log_dtk_audio(false)
, m_log_dsp_audio(false)
, m_speed(0)
{
INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized");
}
// Executed from sound stream thread
unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit)
{

View File

@ -19,21 +19,10 @@
#define CONTROL_FACTOR 0.2f // in freq_shift per fifo size offset
#define CONTROL_AVG 32
class CMixer {
public:
CMixer(unsigned int BackendSampleRate)
: m_dma_mixer(this, 32000)
, m_streaming_mixer(this, 48000)
, m_wiimote_speaker_mixer(this, 3000)
, m_sampleRate(BackendSampleRate)
, m_log_dtk_audio(0)
, m_log_dsp_audio(0)
, m_speed(0)
class CMixer
{
INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized");
}
public:
CMixer(unsigned int BackendSampleRate);
virtual ~CMixer() {}
// Called from audio threads

View File

@ -8,6 +8,7 @@
#include "AudioCommon/DPL2Decoder.h"
#include "AudioCommon/OpenALStream.h"
#include "Common/Thread.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#if defined HAVE_OPENAL && HAVE_OPENAL

View File

@ -9,7 +9,9 @@
#include <SLES/OpenSLES_Android.h>
#include "AudioCommon/OpenSLESStream.h"
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
// engine interfaces
static SLObjectItf engineObject;

View File

@ -6,6 +6,7 @@
#include "AudioCommon/PulseAudioStream.h"
#include "Common/CommonTypes.h"
#include "Common/Thread.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
namespace

View File

@ -9,6 +9,7 @@
#include "AudioCommon/Mixer.h"
#include "AudioCommon/WaveFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
class SoundStream
{

View File

@ -6,6 +6,7 @@
#include "AudioCommon/WaveFile.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
enum { BUF_SIZE = 32*1024 };

View File

@ -6,6 +6,8 @@
#include "AudioCommon/AudioCommon.h"
#include "AudioCommon/XAudio2Stream.h"
#include "Common/Event.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#ifndef XAUDIO2_DLL
#error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path.

View File

@ -10,6 +10,8 @@
#include "AudioCommon/AudioCommon.h"
#include "AudioCommon/XAudio2_7Stream.h"
#include "Common/Event.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
struct StreamingVoiceContext2_7 : public IXAudio2VoiceCallback
{

View File

@ -27,7 +27,8 @@
*/
#include "AudioCommon/aldlist.h"
#include "Common/Common.h"
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#ifdef _WIN32
#include "../../../Externals/OpenAL/include/al.h"
#include "../../../Externals/OpenAL/include/alc.h"

View File

@ -25,6 +25,7 @@
#include <vector>
#include "Common/Assert.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/Flag.h"

View File

@ -91,8 +91,3 @@ enum EMUSTATE_CHANGE
EMUSTATE_CHANGE_PAUSE,
EMUSTATE_CHANGE_STOP
};
#include "Common/CommonTypes.h" // IWYU pragma: export
#include "Common/CommonFuncs.h" // IWYU pragma: export // NOLINT
#include "Common/MsgHandler.h" // IWYU pragma: export
#include "Common/Logging/Log.h" // IWYU pragma: export

View File

@ -12,9 +12,11 @@
#include <vector>
#include <sys/stat.h>
#include "Common/CommonFuncs.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#ifdef _WIN32
#include <commdlg.h> // for GetSaveFileName

View File

@ -10,7 +10,7 @@
#include <string>
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/NonCopyable.h"
#ifdef _WIN32

View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "Common/GL/GLInterface/EGL.h"
#include "Common/Logging/Log.h"
// Show the current FPS
void cInterfaceEGL::Swap()

View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "Common/GL/GLInterface/EGLX11.h"
#include "Common/Logging/Log.h"
EGLDisplay cInterfaceEGLX11::OpenDisplay()
{

View File

@ -5,6 +5,7 @@
#include <string>
#include <windows.h>
#include "Common/MsgHandler.h"
#include "Common/GL/GLInterface/WGL.h"
#include "Common/Logging/Log.h"

View File

@ -10,6 +10,7 @@
#include <string>
#include <vector>
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"

View File

@ -9,6 +9,7 @@
#endif
#include "Common/Logging/ConsoleListener.h"
#include "Common/Logging/Log.h"
ConsoleListener::ConsoleListener()
{

View File

@ -10,8 +10,9 @@
#include <set>
#include <string>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/NonCopyable.h"
#include "Common/Logging/Log.h"
#define MAX_MESSAGES 8000
#define MAX_MSGLEN 1024

View File

@ -9,7 +9,9 @@
#include "Common/CommonTypes.h"
#include "Common/MemArena.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#ifdef _WIN32
#include <windows.h>

View File

@ -7,7 +7,9 @@
#include <string>
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
static MsgAlertHandler msg_handler = DefaultMsgHandler;

View File

@ -7,11 +7,13 @@
#include <string>
#include <utility>
#include "Common/CommonFuncs.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/NandPaths.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
namespace Common
{

View File

@ -39,9 +39,11 @@
#include <ctime>
#include <string>
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/SDCardUtil.h"
#include "Common/Logging/Log.h"
#ifndef _WIN32
#include <unistd.h> // for unlink()

View File

@ -14,9 +14,11 @@
#include <string>
#include <vector>
#include "Common/CommonFuncs.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#ifdef _WIN32
#include <Windows.h>

View File

@ -11,7 +11,7 @@
#include <string>
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
std::string StringFromFormatV(const char* format, va_list args);

View File

@ -8,10 +8,12 @@
#include <string>
#include <vector>
#include "Common/CommonFuncs.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/SysConf.h"
#include "Common/Logging/Log.h"
SysConf::SysConf()
: m_IsValid(false)

View File

@ -10,7 +10,9 @@
#include <string>
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
// This class is meant to edit the values in a given Wii SYSCONF file
// It currently does not add/remove/rearrange sections,

View File

@ -1,7 +1,9 @@
// This file is public domain, in case it's useful to anyone. -comex
#include "Common/MsgHandler.h"
#include "Common/Timer.h"
#include "Common/TraversalClient.h"
#include "Common/Logging/Log.h"
static void GetRandomishBytes(u8* buf, size_t size)
{

View File

@ -5,8 +5,9 @@
#include <string>
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/HLE/HLE_OS.h"
#include "Core/HW/Memmap.h"
#include "Core/PowerPC/PowerPC.h"

View File

@ -5,6 +5,7 @@
#include <fcntl.h>
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"

View File

@ -7,6 +7,7 @@
#endif
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"

View File

@ -2,8 +2,9 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/HW/EXI_Device.h"
#include "Core/HW/EXI_DeviceEthernet.h"
#include "Core/HW/BBA-TAP/TAP_Win32.h"

View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#if HAVE_PORTAUDIO

View File

@ -8,6 +8,8 @@
#include "Common/ColorUtil.h"
#include "Common/FileUtil.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "Core/HW/GCMemcard.h"
static void ByteSwap(u8 *valueA, u8 *valueB)

View File

@ -7,6 +7,7 @@
#include <algorithm>
#include <string>
#include "Common/CommonFuncs.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/NandPaths.h"

View File

@ -5,6 +5,7 @@
#include <string>
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/HW/SI_Device.h"
#include "Core/HW/SI_DeviceAMBaseboard.h"
#include "Core/HW/SI_DeviceDanceMat.h"

View File

@ -18,12 +18,15 @@
#include <polarssl/md5.h>
#include <polarssl/sha1.h>
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MathUtil.h"
#include "Common/MsgHandler.h"
#include "Common/NandPaths.h"
#include "Common/StringUtil.h"
#include "Common/Crypto/ec.h"
#include "Common/Logging/Log.h"
#include "Core/HW/WiiSaveCrypted.h"

View File

@ -11,6 +11,7 @@
#include <thread>
#include <vector>
#include "Common/Common.h"
#include "Common/FifoQueue.h"
#include "Common/NonCopyable.h"
#include "Common/Timer.h"

View File

@ -14,7 +14,7 @@
#include "Common/FileUtil.h"
#include "Common/Crypto/ec.h"
#include "Common/Logging/Log.h"
#include "Core/ec_wii.h"
static u32 default_NG_id = 0x0403AC68;

View File

@ -19,7 +19,9 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/Hash.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "DiscIO/Blob.h"
#include "DiscIO/CompressedBlob.h"
#include "DiscIO/DiscScrubber.h"

View File

@ -12,6 +12,7 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#include "DiscIO/DiscScrubber.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/Volume.h"

View File

@ -8,6 +8,8 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "DiscIO/Blob.h"
#include "DiscIO/DriveBlob.h"

View File

@ -11,8 +11,9 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "DiscIO/Filesystem.h"
#include "DiscIO/FileSystemGCWii.h"
#include "DiscIO/Volume.h"

View File

@ -15,6 +15,7 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MathUtil.h"
#include "Common/MsgHandler.h"
#include "Common/NandPaths.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"

View File

@ -13,7 +13,7 @@
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "DiscIO/Blob.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeCreator.h"

View File

@ -11,6 +11,7 @@
#include "Common/ColorUtil.h"
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "DiscIO/Blob.h"

View File

@ -11,7 +11,9 @@
#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "DiscIO/Blob.h"
#include "DiscIO/Volume.h"
#include "DiscIO/VolumeWad.h"

View File

@ -8,8 +8,11 @@
#include <string>
#include <vector>
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "DiscIO/WbfsBlob.h"
namespace DiscIO

View File

@ -16,7 +16,9 @@
#include <wx/textctrl.h>
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/ActionReplay.h"
#include "Core/ARDecrypt.h"
#include "DolphinWX/ARCodeAddEdit.h"

View File

@ -14,6 +14,7 @@
#include <wx/stattext.h>
#include "AudioCommon/AudioCommon.h"
#include "Common/Common.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "DolphinWX/WxUtils.h"

View File

@ -13,6 +13,7 @@
#include <wx/sizer.h>
#include <wx/stattext.h>
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Core/ConfigManager.h"

View File

@ -11,6 +11,7 @@
#include "Common/CommonTypes.h"
#include "Common/Event.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/LogManager.h"
#include "Core/BootManager.h"

View File

@ -24,7 +24,9 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Logging/Log.h"
#include "Core/HW/GCMemcard.h"
#include "DolphinWX/MemcardManager.h"
#include "DolphinWX/WxUtils.h"

View File

@ -3,6 +3,8 @@
// Refer to the license.txt file included.
#include "Common/BitSet.h"
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "VideoBackends/D3D/D3DBase.h"

View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DTexture.h"

View File

@ -8,6 +8,8 @@
#include "png.h"
#include "Common/FileUtil.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "VideoCommon/ImageWrite.h"
bool SaveData(const std::string& filename, const char* data)

View File

@ -7,8 +7,8 @@
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/sfont.inc"
#include "VideoCommon/TextureDecoder.h"