diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-20 02:08:44 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-20 02:08:44 +0100 |
| commit | 6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch) | |
| tree | cfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/AudioCommon/AudioCommon.cpp | |
| parent | afba0d736d363fa4c71b86d84a1caad3d52f147e (diff) | |
| parent | 24ba058404d8036a977a41e55c58a7326302cb34 (diff) | |
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/AudioCommon/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 7bb1e093f9..a8229b3f84 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -2,21 +2,24 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "AudioCommon.h" -#include "FileUtil.h" -#include "Mixer.h" -#include "NullSoundStream.h" -#include "DSoundStream.h" -#include "XAudio2_7Stream.h" -#include "XAudio2Stream.h" -#include "AOSoundStream.h" -#include "AlsaSoundStream.h" -#include "CoreAudioSoundStream.h" -#include "OpenALStream.h" -#include "PulseAudioStream.h" -#include "OpenSLESStream.h" -#include "../Core/Movie.h" -#include "../Core/ConfigManager.h" + +#include "AudioCommon/AlsaSoundStream.h" +#include "AudioCommon/AOSoundStream.h" +#include "AudioCommon/AudioCommon.h" +#include "AudioCommon/CoreAudioSoundStream.h" +#include "AudioCommon/DSoundStream.h" +#include "AudioCommon/Mixer.h" +#include "AudioCommon/NullSoundStream.h" +#include "AudioCommon/OpenALStream.h" +#include "AudioCommon/OpenSLESStream.h" +#include "AudioCommon/PulseAudioStream.h" +#include "AudioCommon/XAudio2_7Stream.h" +#include "AudioCommon/XAudio2Stream.h" + +#include "Common/FileUtil.h" + +#include "Core/ConfigManager.h" +#include "Core/Movie.h" // This shouldn't be a global, at least not here. SoundStream *soundStream = nullptr; |
