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

output/Control: move pipe initialization to the OutputThread

Browse Source 
Un-protect the SharedPipeConsumer instance, and make it available in
the OutputThread only.  This gives more well-defined mutex protection.
This commit is contained in:
Max Kellermann 2016-12-20 23:19:12 +01:00
parent 71c72ed072
commit f86d6b0162
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/output/Internal.hxx
View File

@ -256,6 +256,11 @@ struct AudioOutput {
* The #AudioFormat requested by #Command::OPEN. * The #AudioFormat requested by #Command::OPEN.
*/ */
AudioFormat audio_format; AudioFormat audio_format;
/**
* The #MusicPipe passed to #Command::OPEN.
*/
const MusicPipe *pipe;
} request; } request;
/** /**

3
src/output/OutputControl.cxx
View File

@ -122,8 +122,7 @@ AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &mp)
} }
request.audio_format = audio_format; request.audio_format = audio_format;
request.pipe = ∓
pipe.Init(mp);
if (!thread.IsDefined()) if (!thread.IsDefined())
StartThread(); StartThread();

6
src/output/OutputThread.cxx
View File

@ -145,6 +145,7 @@ AudioOutput::Open()
return; return;
in_audio_format = request.audio_format; in_audio_format = request.audio_format;
pipe.Init(*request.pipe);
bool success; bool success;
@ -284,8 +285,9 @@ AudioOutput::Reopen()
{ {
assert(open); assert(open);
if (request.audio_format != in_audio_format && if ((request.audio_format != in_audio_format &&
!config_audio_format.IsFullyDefined()) { !config_audio_format.IsFullyDefined()) ||
request.pipe != &pipe.GetPipe()) {
Close(true); Close(true);
Open(); Open();
} else { } else {