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

.. instead of DeferEvent, which is not thread-safe. This caused various playback problems, which was initially caused by the DeferEvent/InjectEvent split in commit 774b4313 Closes https://github.com/MusicPlayerDaemon/MPD/issues/1298

lib/nfs/FileReader: use the thread-safe InjectEvent
5fab107f · Max Kellermann · f31920e0 · 5fab107f · 5fab107f
Commit 5fab107f authored Oct 20, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

NEWS NEWS +2 -0

FileReader.hxx src/lib/nfs/FileReader.hxx +6 -3

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.23.2 (not yet released)
+* input
+  - nfs: fix playback bug
 * output
  - pipewire: send artist and title to PipeWire
 * neighbor

--- a/src/lib/nfs/FileReader.hxx
+++ b/src/lib/nfs/FileReader.hxx
@@ -22,7 +22,7 @@

 #include "Lease.hxx"
 #include "Callback.hxx"
-#include "event/DeferEvent.hxx"
+#include "event/InjectEvent.hxx"
 #include "util/Compiler.h"

 #include <cstddef>
@@ -63,7 +63,10 @@ class NfsFileReader : NfsLease, NfsCallback {

 	nfsfh *fh;

-	DeferEvent defer_open;
+	/**
+	 * To inject the Open() call into the I/O thread.
+	 */
+	InjectEvent defer_open;

 public:
 	NfsFileReader() noexcept;
@@ -150,7 +153,7 @@ private:
 	void OnNfsCallback(unsigned status, void *data) noexcept final;
 	void OnNfsError(std::exception_ptr &&e) noexcept final;

-	/* DeferEvent callback */
+	/* InjectEvent callback */
 	void OnDeferredOpen() noexcept;
 };