ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1037 from lioncash/mem_fn 

AudioCommon: Remove unnecessary usages of mem_fn
This commit is contained in:
Ryan Houdek 2014-09-08 18:01:33 -05:00
parent bf0c4a644b 789a500ddc
commit 859f86ac2d
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/AudioCommon/AOSoundStream.cpp
View File

@ -2,8 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <functional> #include <cstring>
#include <string.h>
#include "AudioCommon/AOSoundStream.h" #include "AudioCommon/AOSoundStream.h"
#include "AudioCommon/Mixer.h" #include "AudioCommon/Mixer.h"
@ -50,7 +49,7 @@ bool AOSound::Start()
{ {
memset(realtimeBuffer, 0, sizeof(realtimeBuffer)); memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this); thread = std::thread(&AOSound::SoundLoop, this);
return true; return true;
} }

4
Source/Core/AudioCommon/AlsaSoundStream.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <functional>
#include "AudioCommon/AlsaSoundStream.h" #include "AudioCommon/AlsaSoundStream.h"
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/Thread.h" #include "Common/Thread.h"
@ -24,7 +22,7 @@ AlsaSound::~AlsaSound()
bool AlsaSound::Start() bool AlsaSound::Start()
{ {
thread = std::thread(std::mem_fn(&AlsaSound::SoundLoop), this); thread = std::thread(&AlsaSound::SoundLoop, this);
thread_data = 0; thread_data = 0;
return true; return true;
} }

4
Source/Core/AudioCommon/PulseAudioStream.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <functional>
#include "AudioCommon/PulseAudioStream.h" #include "AudioCommon/PulseAudioStream.h"
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/Thread.h" #include "Common/Thread.h"
@ -25,7 +23,7 @@ PulseAudio::PulseAudio(CMixer *mixer)
bool PulseAudio::Start() bool PulseAudio::Start()
{ {
m_run_thread = true; m_run_thread = true;
m_thread = std::thread(std::mem_fn(&PulseAudio::SoundLoop), this); m_thread = std::thread(&PulseAudio::SoundLoop, this);
return true; return true;
} }