Eliminate some trampoline functions.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7015 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 3 insertions, 6 deletions

diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
index fd7aa31cfd..19d5d5c298 100644
--- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
+++ b/Source/Core/AudioCommon/Src/PulseAudioStream.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 "Common.h"
 #include "Thread.h"
 
@@ -35,15 +37,10 @@ PulseAudio::~PulseAudio()
 	delete [] mix_buffer;
 }
 
-void PulseAudio::ThreadTrampoline(PulseAudio* args)
-{
-	args->SoundLoop();
-}
-
 bool PulseAudio::Start()
 {
 	thread_running = true;
-	thread = std::thread(ThreadTrampoline, this);
+	thread = std::thread(std::mem_fun(&PulseAudio::SoundLoop), this);
 	return true;
 }