diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/event/DeferEvent.hxx (renamed from src/event/DeferredCall.hxx) | 10 | ||||
| -rw-r--r-- | src/input/AsyncInputStream.hxx | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 6a7e7138b..c2ea42f06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -520,7 +520,7 @@ libevent_a_SOURCES = \ src/event/TimerEvent.hxx src/event/TimerEvent.cxx \ src/event/IdleMonitor.hxx src/event/IdleMonitor.cxx \ src/event/DeferredMonitor.hxx src/event/DeferredMonitor.cxx \ - src/event/DeferredCall.hxx \ + src/event/DeferEvent.hxx \ src/event/MaskMonitor.hxx src/event/MaskMonitor.cxx \ src/event/SocketMonitor.cxx src/event/SocketMonitor.hxx \ src/event/BufferedSocket.cxx src/event/BufferedSocket.hxx \ diff --git a/src/event/DeferredCall.hxx b/src/event/DeferEvent.hxx index a3310c888..f9d888db6 100644 --- a/src/event/DeferredCall.hxx +++ b/src/event/DeferEvent.hxx @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_EVENT_DEFERRED_CALL_HXX -#define MPD_EVENT_DEFERRED_CALL_HXX +#ifndef MPD_DEFER_EVENT_HXX +#define MPD_DEFER_EVENT_HXX #include "check.h" #include "DeferredMonitor.hxx" @@ -29,19 +29,19 @@ * * This class is thread-safe. */ -class DeferredCall final : DeferredMonitor { +class DeferEvent final : DeferredMonitor { typedef BoundMethod<void()> Callback; const Callback callback; public: - DeferredCall(EventLoop &_loop, Callback _callback) + DeferEvent(EventLoop &_loop, Callback _callback) :DeferredMonitor(_loop), callback(_callback) {} using DeferredMonitor::GetEventLoop; using DeferredMonitor::Schedule; using DeferredMonitor::Cancel; -protected: +private: void RunDeferred() override { callback(); } diff --git a/src/input/AsyncInputStream.hxx b/src/input/AsyncInputStream.hxx index 76a06d844..6bff6cd8c 100644 --- a/src/input/AsyncInputStream.hxx +++ b/src/input/AsyncInputStream.hxx @@ -21,7 +21,7 @@ #define MPD_ASYNC_INPUT_STREAM_HXX #include "InputStream.hxx" -#include "event/DeferredCall.hxx" +#include "event/DeferEvent.hxx" #include "util/HugeAllocator.hxx" #include "util/CircularBuffer.hxx" @@ -38,8 +38,8 @@ class AsyncInputStream : public InputStream { NONE, SCHEDULED, PENDING }; - DeferredCall deferred_resume; - DeferredCall deferred_seek; + DeferEvent deferred_resume; + DeferEvent deferred_seek; HugeArray<uint8_t> allocation; @@ -167,7 +167,7 @@ protected: private: void Resume(); - /* for DeferredCall */ + /* for DeferEvent */ void DeferredResume() noexcept; void DeferredSeek() noexcept; }; |