From 17e79a966a4051c089e03b25de9640a55f39f01c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Aug 2014 22:53:09 -0400 Subject: [PATCH] AudioCommon: Get rid of some unnecessary mem_fn calls --- Source/Core/AudioCommon/DSoundStream.cpp | 6 ++---- Source/Core/AudioCommon/OpenALStream.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/AudioCommon/DSoundStream.cpp b/Source/Core/AudioCommon/DSoundStream.cpp index df96a9551f..d9c81db6b9 100644 --- a/Source/Core/AudioCommon/DSoundStream.cpp +++ b/Source/Core/AudioCommon/DSoundStream.cpp @@ -3,9 +3,7 @@ // Refer to the license.txt file included. #include -#include - -#include +#include #include "AudioCommon/AudioCommon.h" #include "AudioCommon/DSoundStream.h" @@ -123,7 +121,7 @@ bool DSound::Start() dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER); memset(p1, 0, num1); dsBuffer->Unlock(p1, num1, 0, 0); - thread = std::thread(std::mem_fn(&DSound::SoundLoop), this); + thread = std::thread(&DSound::SoundLoop, this); return true; } diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 84b9a72718..d9a26cac14 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -38,7 +38,7 @@ bool OpenALStream::Start() //period_size_in_millisec = 1000 / refresh; alcMakeContextCurrent(pContext); - thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this); + thread = std::thread(&OpenALStream::SoundLoop, this); bReturn = true; } else