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

PulseOutputPlugin: avoid locking mainloop object from within mainloop thread

Browse Source 
-fixes regression introduced by:
 '8d6fedf8177d0d2ced81e6d93d35c368b2ac69db [PATCH] Mixer: add class MixerListener'
-listener.OnMixerVolumeChanged() called GetVolume() which attempted to acquire
the lock but as per 'pa_threaded_mainloop_lock()' documentation:
This function may not be called inside the event loop thread. Events that are
dispatched from the event loop thread are executed with this lock held
-this patch seperates the underlying action of GetVolume() into a new
GetVolumeInternal() function, to be called only when the lock is already held, as
is the case for the listener.OnMixerVolumeChanged() call
This commit is contained in:
Pete Beardmore 2014-03-05 08:08:12 +00:00
parent 3a3fb98f79
commit 9da57e7458
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mixer/plugins/PulseMixerPlugin.cxx
View File

@ -52,6 +52,7 @@ public:
void Offline(); void Offline();
void VolumeCallback(const pa_sink_input_info *i, int eol); void VolumeCallback(const pa_sink_input_info *i, int eol);
void Update(pa_context *context, pa_stream *stream); void Update(pa_context *context, pa_stream *stream);
int GetVolumeInternal(Error &error);
/* virtual methods from class Mixer */ /* virtual methods from class Mixer */
virtual bool Open(gcc_unused Error &error) override { virtual bool Open(gcc_unused Error &error) override {
@ -92,7 +93,7 @@ PulseMixer::VolumeCallback(const pa_sink_input_info *i, int eol)
online = true; online = true;
volume = i->volume; volume = i->volume;
listener.OnMixerVolumeChanged(*this, GetVolume(IgnoreError())); listener.OnMixerVolumeChanged(*this, GetVolumeInternal(IgnoreError()));
} }
/** /**
@ -187,15 +188,23 @@ PulseMixer::GetVolume(gcc_unused Error &error)
{ {
pulse_output_lock(output); pulse_output_lock(output);
int result = online int result = GetVolumeInternal(error);
? (int)((100 * (pa_cvolume_avg(&volume) + 1)) / PA_VOLUME_NORM)
: -1;
pulse_output_unlock(output); pulse_output_unlock(output);
return result; return result;
} }
/**
* Pulse mainloop lock must be held by caller
*/
int
PulseMixer::GetVolumeInternal(gcc_unused Error &error)
{
return online ?
(int)((100 * (pa_cvolume_avg(&volume) + 1)) / PA_VOLUME_NORM)
: -1;
}
bool bool
PulseMixer::SetVolume(unsigned new_volume, Error &error) PulseMixer::SetVolume(unsigned new_volume, Error &error)
{ {