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

lib/nfs/FileReader: use the thread-safe InjectEvent

Browse Source 
.. instead of DeferEvent, which is not thread-safe.  This caused
various playback problems, which was initially caused by the
DeferEvent/InjectEvent split in commit 774b4313f2

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1298
This commit is contained in:
Max Kellermann 2021-10-20 09:24:45 +02:00
parent f31920e092
commit 5fab107fd3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.23.2 (not yet released) ver 0.23.2 (not yet released)
* input
- nfs: fix playback bug
* output * output
- pipewire: send artist and title to PipeWire - pipewire: send artist and title to PipeWire
* neighbor * neighbor

9
src/lib/nfs/FileReader.hxx
View File

@ -22,7 +22,7 @@
#include "Lease.hxx" #include "Lease.hxx"
#include "Callback.hxx" #include "Callback.hxx"
#include "event/DeferEvent.hxx" #include "event/InjectEvent.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <cstddef> #include <cstddef>
@ -63,7 +63,10 @@ class NfsFileReader : NfsLease, NfsCallback {
nfsfh *fh; nfsfh *fh;
DeferEvent defer_open; /**
* To inject the Open() call into the I/O thread.
*/
InjectEvent defer_open;
public: public:
NfsFileReader() noexcept; NfsFileReader() noexcept;
@ -150,7 +153,7 @@ private:
void OnNfsCallback(unsigned status, void *data) noexcept final; void OnNfsCallback(unsigned status, void *data) noexcept final;
void OnNfsError(std::exception_ptr &&e) noexcept final; void OnNfsError(std::exception_ptr &&e) noexcept final;
/* DeferEvent callback */ /* InjectEvent callback */
void OnDeferredOpen() noexcept; void OnDeferredOpen() noexcept;
}; };