mirror of
https://github.com/godotengine/godot.git
synced 2026-01-06 10:11:57 +03:00
Modernize Mutex
- Based on C++11's `mutex` - No more need to allocate-deallocate or check for null - No pointer anymore, just a member variable - Platform-specific implementations no longer needed - Simpler for `NO_THREADS` - `BinaryMutex` added for special cases as the non-recursive version - `MutexLock` now takes a reference. At this point the cases of null `Mutex`es are rare. If you ever need that, just don't use `MutexLock`. - `ScopedMutexLock` is dropped and replaced by `MutexLock`, because they were pretty much the same.
This commit is contained in:
@@ -406,7 +406,6 @@ Error AudioDriverWASAPI::init() {
|
||||
exit_thread = false;
|
||||
thread_exited = false;
|
||||
|
||||
mutex = Mutex::create(true);
|
||||
thread = Thread::create(thread_func, this);
|
||||
|
||||
return OK;
|
||||
@@ -782,14 +781,12 @@ void AudioDriverWASAPI::start() {
|
||||
|
||||
void AudioDriverWASAPI::lock() {
|
||||
|
||||
if (mutex)
|
||||
mutex->lock();
|
||||
mutex.lock();
|
||||
}
|
||||
|
||||
void AudioDriverWASAPI::unlock() {
|
||||
|
||||
if (mutex)
|
||||
mutex->unlock();
|
||||
mutex.unlock();
|
||||
}
|
||||
|
||||
void AudioDriverWASAPI::finish() {
|
||||
@@ -804,11 +801,6 @@ void AudioDriverWASAPI::finish() {
|
||||
|
||||
finish_capture_device();
|
||||
finish_render_device();
|
||||
|
||||
if (mutex) {
|
||||
memdelete(mutex);
|
||||
mutex = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Error AudioDriverWASAPI::capture_start() {
|
||||
@@ -863,7 +855,6 @@ String AudioDriverWASAPI::capture_get_device() {
|
||||
|
||||
AudioDriverWASAPI::AudioDriverWASAPI() {
|
||||
|
||||
mutex = NULL;
|
||||
thread = NULL;
|
||||
|
||||
samples_in.clear();
|
||||
|
||||
@@ -75,7 +75,7 @@ class AudioDriverWASAPI : public AudioDriver {
|
||||
AudioDeviceWASAPI audio_input;
|
||||
AudioDeviceWASAPI audio_output;
|
||||
|
||||
Mutex *mutex;
|
||||
Mutex mutex;
|
||||
Thread *thread;
|
||||
|
||||
Vector<int32_t> samples_in;
|
||||
|
||||
Reference in New Issue
Block a user