From e85f42110f411ec9c9b30d7f8f1a57c02e9cb01f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 6 Oct 2019 06:40:32 +0300 Subject: libcamera: timer: Remove the interval() method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The libcamera timers are single-shot timers. They are started with a duration, but fire once only, not based on an interval. Remove the interval concept by removing the interval() method, and rename other occurences of interval to duration. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- src/libcamera/timer.cpp | 19 ++++++------------- src/qcam/qt_event_dispatcher.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index b3cea3da..34410bab 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -61,19 +61,18 @@ Timer::~Timer() */ /** - * \brief Start or restart the timer with a timeout of \a interval - * \param[in] interval The timer duration in milliseconds + * \brief Start or restart the timer with a timeout of \a duration + * \param[in] duration The timer duration in milliseconds * * If the timer is already running it will be stopped and restarted. */ -void Timer::start(std::chrono::milliseconds interval) +void Timer::start(std::chrono::milliseconds duration) { - interval_ = interval; - deadline_ = utils::clock::now() + interval; + deadline_ = utils::clock::now() + duration; LOG(Timer, Debug) - << "Starting timer " << this << " with interval " - << interval.count() << ": deadline " + << "Starting timer " << this << " with duration " + << duration.count() << ": deadline " << utils::time_point_to_string(deadline_); registerTimer(); @@ -113,12 +112,6 @@ bool Timer::isRunning() const return deadline_ != utils::time_point(); } -/** - * \fn Timer::interval() - * \brief Retrieve the timer interval - * \return The timer interval in milliseconds - */ - /** * \fn Timer::deadline() * \brief Retrieve the timer deadline diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp index 994af3ea..9e989bef 100644 --- a/src/qcam/qt_event_dispatcher.cpp +++ b/src/qcam/qt_event_dispatcher.cpp @@ -5,6 +5,7 @@ * qt_event_dispatcher.cpp - qcam - Qt-based event dispatcher */ +#include #include #include @@ -112,7 +113,11 @@ void QtEventDispatcher::exceptionNotifierActivated(int socket) void QtEventDispatcher::registerTimer(Timer *timer) { - int timerId = startTimer(timer->interval()); + std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); + std::chrono::steady_clock::duration duration = timer->deadline() - now; + std::chrono::milliseconds msec = + std::chrono::duration_cast(duration); + int timerId = startTimer(msec); timers_[timerId] = timer; timerIds_[timer] = timerId; } -- cgit v1.2.1