diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-01-27 21:34:37 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-01-27 21:34:37 +0000 |
| commit | 0b90f720735c6596d8acc11d7fe5105b31b6313f (patch) | |
| tree | ad8c1836c01e3070e6e3adfba13d93fc51582104 /Source/Core/AudioCommon/Src/PulseAudioStream.cpp | |
| parent | 2c05c49a04aa838047417825c289958efb59ee3c (diff) | |
Forgot about some Linux files using Common::Thread
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6934 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/PulseAudioStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/PulseAudioStream.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index afad3a31b1..fd7aa31cfd 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -35,24 +35,22 @@ PulseAudio::~PulseAudio() delete [] mix_buffer; } -void *PulseAudio::ThreadTrampoline(void *args) +void PulseAudio::ThreadTrampoline(PulseAudio* args) { - ((PulseAudio *)args)->SoundLoop(); - return NULL; + args->SoundLoop(); } bool PulseAudio::Start() { thread_running = true; - thread = new Common::Thread(&ThreadTrampoline, this); + thread = std::thread(ThreadTrampoline, this); return true; } void PulseAudio::Stop() { thread_running = false; - delete thread; - thread = NULL; + thread.join(); } void PulseAudio::Update() |
