oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

MixerInternal: use Mutex instead of GMutex

Browse Source
This commit is contained in:
Max Kellermann 2013-04-16 23:46:36 +02:00
parent 8ce9b53093
commit 7b5f7c041b
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/MixerControl.cxx
View File

@ -21,6 +21,8 @@
#include "MixerControl.hxx" #include "MixerControl.hxx"
#include "MixerInternal.hxx" #include "MixerInternal.hxx"
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
@ -48,14 +50,11 @@ mixer_free(Mixer *mixer)
{ {
assert(mixer != NULL); assert(mixer != NULL);
assert(mixer->plugin != NULL); assert(mixer->plugin != NULL);
assert(mixer->mutex != NULL);
/* mixers with the "global" flag set might still be open at /* mixers with the "global" flag set might still be open at
this point (see mixer_auto_close()) */ this point (see mixer_auto_close()) */
mixer_close(mixer); mixer_close(mixer);
g_mutex_free(mixer->mutex);
mixer->plugin->finish(mixer); mixer->plugin->finish(mixer);
} }
@ -67,7 +66,7 @@ mixer_open(Mixer *mixer, GError **error_r)
assert(mixer != NULL); assert(mixer != NULL);
assert(mixer->plugin != NULL); assert(mixer->plugin != NULL);
g_mutex_lock(mixer->mutex); const ScopeLock protect(mixer->mutex);
if (mixer->open) if (mixer->open)
success = true; success = true;
@ -78,8 +77,6 @@ mixer_open(Mixer *mixer, GError **error_r)
mixer->failed = !success; mixer->failed = !success;
g_mutex_unlock(mixer->mutex);
return success; return success;
} }
@ -102,12 +99,10 @@ mixer_close(Mixer *mixer)
assert(mixer != NULL); assert(mixer != NULL);
assert(mixer->plugin != NULL); assert(mixer->plugin != NULL);
g_mutex_lock(mixer->mutex); const ScopeLock protect(mixer->mutex);
if (mixer->open) if (mixer->open)
mixer_close_internal(mixer); mixer_close_internal(mixer);
g_mutex_unlock(mixer->mutex);
} }
void void
@ -142,7 +137,7 @@ mixer_get_volume(Mixer *mixer, GError **error_r)
!mixer_open(mixer, error_r)) !mixer_open(mixer, error_r))
return -1; return -1;
g_mutex_lock(mixer->mutex); const ScopeLock protect(mixer->mutex);
if (mixer->open) { if (mixer->open) {
GError *error = NULL; GError *error = NULL;
@ -155,16 +150,12 @@ mixer_get_volume(Mixer *mixer, GError **error_r)
} else } else
volume = -1; volume = -1;
g_mutex_unlock(mixer->mutex);
return volume; return volume;
} }
bool bool
mixer_set_volume(Mixer *mixer, unsigned volume, GError **error_r) mixer_set_volume(Mixer *mixer, unsigned volume, GError **error_r)
{ {
bool success;
assert(mixer != NULL); assert(mixer != NULL);
assert(volume <= 100); assert(volume <= 100);
@ -172,14 +163,8 @@ mixer_set_volume(Mixer *mixer, unsigned volume, GError **error_r)
!mixer_open(mixer, error_r)) !mixer_open(mixer, error_r))
return false; return false;
g_mutex_lock(mixer->mutex); const ScopeLock protect(mixer->mutex);
if (mixer->open) { return mixer->open &&
success = mixer->plugin->set_volume(mixer, volume, error_r); mixer->plugin->set_volume(mixer, volume, error_r);
} else
success = false;
g_mutex_unlock(mixer->mutex);
return success;
} }

6
src/MixerInternal.hxx
View File

@ -22,8 +22,7 @@
#include "MixerPlugin.hxx" #include "MixerPlugin.hxx"
#include "MixerList.hxx" #include "MixerList.hxx"
#include "thread/Mutex.hxx"
#include <glib.h>
class Mixer { class Mixer {
public: public:
@ -33,7 +32,7 @@ public:
* This mutex protects all of the mixer struct, including its * This mutex protects all of the mixer struct, including its
* implementation, so plugins don't have to deal with that. * implementation, so plugins don't have to deal with that.
*/ */
GMutex *mutex; Mutex mutex;
/** /**
* Is the mixer device currently open? * Is the mixer device currently open?
@ -49,7 +48,6 @@ public:
public: public:
Mixer(const mixer_plugin &_plugin) Mixer(const mixer_plugin &_plugin)
:plugin(&_plugin), :plugin(&_plugin),
mutex(g_mutex_new()),
open(false), open(false),
failed(false) {} failed(false) {}