summaryrefslogtreecommitdiff
path: root/drivers/alsa
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/alsa')
-rw-r--r--drivers/alsa/audio_driver_alsa.cpp15
-rw-r--r--drivers/alsa/audio_driver_alsa.h2
2 files changed, 5 insertions, 12 deletions
diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp
index fe6cd091b7..400ce31bf7 100644
--- a/drivers/alsa/audio_driver_alsa.cpp
+++ b/drivers/alsa/audio_driver_alsa.cpp
@@ -154,7 +154,6 @@ Error AudioDriverALSA::init() {
Error err = init_device();
if (err == OK) {
- mutex = Mutex::create();
thread = Thread::create(AudioDriverALSA::thread_func, this);
}
@@ -299,16 +298,16 @@ void AudioDriverALSA::set_device(String device) {
void AudioDriverALSA::lock() {
- if (!thread || !mutex)
+ if (!thread)
return;
- mutex->lock();
+ mutex.lock();
}
void AudioDriverALSA::unlock() {
- if (!thread || !mutex)
+ if (!thread)
return;
- mutex->unlock();
+ mutex.unlock();
}
void AudioDriverALSA::finish_device() {
@@ -327,11 +326,6 @@ void AudioDriverALSA::finish() {
memdelete(thread);
thread = NULL;
-
- if (mutex) {
- memdelete(mutex);
- mutex = NULL;
- }
}
finish_device();
@@ -339,7 +333,6 @@ void AudioDriverALSA::finish() {
AudioDriverALSA::AudioDriverALSA() :
thread(NULL),
- mutex(NULL),
pcm_handle(NULL),
device_name("Default"),
new_device("Default") {
diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h
index fb793df6cd..a8caf0fbae 100644
--- a/drivers/alsa/audio_driver_alsa.h
+++ b/drivers/alsa/audio_driver_alsa.h
@@ -40,7 +40,7 @@
class AudioDriverALSA : public AudioDriver {
Thread *thread;
- Mutex *mutex;
+ Mutex mutex;
snd_pcm_t *pcm_handle;