{"id":2022,"url":"https://patchwork.libcamera.org/api/1.1/patches/2022/?format=json","web_url":"https://patchwork.libcamera.org/patch/2022/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190927023023.722396-3-niklas.soderlund@ragnatech.se>","date":"2019-09-27T02:30:23","name":"[libcamera-devel,2/2] qcam: Fix timers not emitting timeout signal","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"abc014e4fe4a820bfb2d43cccc2a1b7580f7f8ce","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2022/mbox/","series":[{"id":507,"url":"https://patchwork.libcamera.org/api/1.1/series/507/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=507","date":"2019-09-27T02:30:21","name":"qcam: Fix issues in the Qt event dispatcher","version":1,"mbox":"https://patchwork.libcamera.org/series/507/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2022/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2022/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ACDBD6165A\n\tfor ;\n\tFri, 27 Sep 2019 04:31:33 +0200 (CEST)","from bismarck.berto.se (unknown [84.172.88.101])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid d96ed830-e0ce-11e9-837a-0050569116f7;\n\tFri, 27 Sep 2019 04:31:02 +0200 (CEST)"],"X-Halon-ID":"d96ed830-e0ce-11e9-837a-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 27 Sep 2019 04:30:23 +0200","Message-Id":"<20190927023023.722396-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.23.0","In-Reply-To":"<20190927023023.722396-1-niklas.soderlund@ragnatech.se>","References":"<20190927023023.722396-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] qcam: Fix timers not emitting timeout\n\tsignal","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 27 Sep 2019 02:31:34 -0000"},"content":"The timer signal was never emitted in QtEventDispatcher::timerEvent(),\nthis results in timers not working as designed running under the Qt\nevent loop. Fix this by emitting the signal on timeout.\n\nSigned-off-by: Niklas Söderlund \n---\n src/qcam/qt_event_dispatcher.cpp | 12 +++++++++++-\n 1 file changed, 11 insertions(+), 1 deletion(-)","diff":"diff --git a/src/qcam/qt_event_dispatcher.cpp b/src/qcam/qt_event_dispatcher.cpp\nindex 6b332f6265d01fe0..fcde374c9936d1f9 100644\n--- a/src/qcam/qt_event_dispatcher.cpp\n+++ b/src/qcam/qt_event_dispatcher.cpp\n@@ -132,9 +132,19 @@ void QtEventDispatcher::unregisterTimer(Timer *timer)\n void QtEventDispatcher::timerEvent(QTimerEvent *event)\n {\n \tauto it = timers_.find(event->timerId());\n-\ttimerIds_.erase(it->second);\n+\n+\tif (it == timers_.end()) {\n+\t\tstd::cout << \"Can't find timer for event\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\tTimer *timer = it->second;\n+\n+\ttimerIds_.erase(timer);\n \tkillTimer(it->first);\n \ttimers_.erase(it);\n+\n+\ttimer->timeout.emit(timer);\n }\n \n void QtEventDispatcher::processEvents()\n","prefixes":["libcamera-devel","2/2"]}