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

Forgot about some Linux files using Common::Thread 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6934 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak 2011-01-27 21:34:37 +00:00
parent 2c05c49a04
commit 0b90f72073
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
View File

@ -33,15 +33,14 @@ AlsaSound::~AlsaSound()
delete [] mix_buffer;
}
static void *ThreadTrampoline(void *args)
static void ThreadTrampoline(AlsaSound* args)
{
reinterpret_cast<AlsaSound *>(args)->SoundLoop();
return NULL;
args->SoundLoop();
}
bool AlsaSound::Start()
{
thread = new Common::Thread(&ThreadTrampoline, this);
thread = std::thread(ThreadTrampoline, this);
thread_data = 0;
return true;
}
@ -49,8 +48,7 @@ bool AlsaSound::Start()
void AlsaSound::Stop()
{
thread_data = 1;
delete thread;
thread = NULL;
thread.join();
}
void AlsaSound::Update()

2
Source/Core/AudioCommon/Src/AlsaSoundStream.h
View File

@ -52,7 +52,7 @@ private:
void AlsaShutdown();
u8 *mix_buffer;
Common::Thread *thread;
std::thread thread;
// 0 = continue
// 1 = shutdown
// 2 = done shutting down.

10
Source/Core/AudioCommon/Src/PulseAudioStream.cpp
View File

@ -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()

4
Source/Core/AudioCommon/Src/PulseAudioStream.h
View File

@ -46,7 +46,7 @@ public:
private:
virtual void SoundLoop();
static void *ThreadTrampoline(void *args);
static void ThreadTrampoline(PulseAudio* args);
bool PulseInit();
void PulseShutdown();
bool Write(const void *data, size_t bytes);
@ -56,7 +56,7 @@ private:
static void StreamWriteCB(pa_stream *s, size_t length, void *userdata);
u8 *mix_buffer;
Common::Thread *thread;
std::thread thread;
volatile bool thread_running;
pa_threaded_mainloop *mainloop;