summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Src/OpenALStream.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2011-01-31 08:19:27 +0000
committerJordan Woyak <jordan.woyak@gmail.com>2011-01-31 08:19:27 +0000
commit1de40588acd0bfa6d49e3d94fef2cbd6dc09f6e5 (patch)
tree93472097d7916eb4680f3b032286f729abdffd46 /Source/Core/AudioCommon/Src/OpenALStream.cpp
parent67a4ac0bf67d9299fb19575ccf5fc2034a8da9fd (diff)
Eliminate some trampoline functions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7015 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/OpenALStream.cpp')
-rw-r--r--Source/Core/AudioCommon/Src/OpenALStream.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 908f1c0099..5d46763613 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -15,6 +15,8 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
+#include <functional>
+
#include "aldlist.h"
#include "OpenALStream.h"
@@ -44,7 +46,7 @@ bool OpenALStream::Start()
if (pContext)
{
alcMakeContextCurrent(pContext);
- thread = std::thread(OpenALStream::ThreadFunc, this);
+ thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this);
bReturn = true;
}
else
@@ -121,11 +123,6 @@ void OpenALStream::Clear(bool mute)
}
}
-void OpenALStream::ThreadFunc(OpenALStream* alstream)
-{
- alstream->SoundLoop();
-}
-
void OpenALStream::SoundLoop()
{
ALenum err;