summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Src/OpenALStream.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2013-01-09 10:26:12 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2013-01-09 10:26:12 -0600
commit01f4d9f386d225675d12cea7fedc1144dd2e02d4 (patch)
tree774545bdf8285ed0e24835dac3b282e163fc922d /Source/Core/AudioCommon/Src/OpenALStream.cpp
parent7600cf106bdc6cde7d63dd325764d41707d5376a (diff)
Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
Diffstat (limited to 'Source/Core/AudioCommon/Src/OpenALStream.cpp')
-rw-r--r--Source/Core/AudioCommon/Src/OpenALStream.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 85685b42cb..b0c856dcad 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -22,8 +22,7 @@
#if defined HAVE_OPENAL && HAVE_OPENAL
-using namespace soundtouch;
-SoundTouch soundTouch;
+soundtouch::SoundTouch soundTouch;
//
// AyuanX: Spec says OpenAL1.1 is thread safe already