From 22120efb2ac169da69f4658fc20601d8906b7845 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 24 Feb 2017 12:30:33 +0100 Subject: [PATCH 1/2] supplement to bd6935a702d7853abfad2ee42cc02696b7898fb1, add stop msg Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/98afb08c5d17ef73b62fb338c180a6decc701c24 Author: Jacek Jendrzej Date: 2017-02-24 (Fri, 24 Feb 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/msgbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp index db9ba0f97..bc364fd9f 100644 --- a/src/gui/widget/msgbox.cpp +++ b/src/gui/widget/msgbox.cpp @@ -315,7 +315,7 @@ int CMsgBox::exec() result = (msg_result_t)ccw_footer->getSelectedButtonObject()->getButtonResult(); loop = false; } - else if (msg == NeutrinoMessages::RECORD_START) { + else if (msg == NeutrinoMessages::RECORD_START || msg == NeutrinoMessages::RECORD_STOP) { CNeutrinoApp::getInstance()->handleMsg(msg, data); } //***ignore*** From 46824f09025cc5559ad665bf4aab130c33e2086d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 10 Jan 2016 16:14:10 +0100 Subject: [PATCH 2/2] rcinput/neutrino: avoid the use of EVT_TIMESET sectionsd's EVT_TIMESET was only used to fix time calculations for input repeat detection. I doubt this reliably worked anyway. Just calculate an absolute input timestamp from CLOCK_MONOTONIC and use that. Even better solution would be to use a newer kernel with EVIOCSCLOCKID ioctl, leave that for later :-) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d2408d1ade63c0e76d0926e9cc09162e2c2d537f Author: Stefan Seyfried Date: 2016-01-10 (Sun, 10 Jan 2016) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 57a0ca62c..28d062bd7 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -5,7 +5,7 @@ and some other guys Homepage: http://dbox.cyberphoria.org/ - Copyright (C) 2006-2014 Stefan Seyfried + Copyright (C) 2006-2016 Stefan Seyfried Copyright (C) 2011 CoolStream International Ltd @@ -1981,7 +1981,11 @@ void CNeutrinoApp::InitZapitClient() void CNeutrinoApp::InitSectiondClient() { g_Sectionsd = new CSectionsdClient; - g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME); + struct timespec t; + if (clock_gettime(CLOCK_MONOTONIC, &t)) { + dprintf(DEBUG_NORMAL, "CLOCK_MONOTONIC not supported? (%m), falling back to EVT_TIMESET\n"); + g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME); + } g_Sectionsd->registerEvent(CSectionsdClient::EVT_GOT_CN_EPG, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_EIT_COMPLETE, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME);