From d14564fd2503dd0afb1352fde0b5c999c8878f62 Mon Sep 17 00:00:00 2001 From: DboxOldie Date: Sat, 23 Jan 2021 23:18:06 +0100 Subject: [PATCH] generate correct camask Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/814cc525b1a41775854f6369bd0dde6b375e903e Author: DboxOldie Date: 2021-01-23 (Sat, 23 Jan 2021) --- src/driver/record.cpp | 5 +++-- src/driver/streamts.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index e36613fc2..0bbd27c45 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -341,11 +341,12 @@ bool CRecordInstance::Stop(bool remove_event) /* Stop do close fd - if started */ record->Stop(); - if(!autoshift) - CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD); + if(!autoshift) + CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing + if (autoshift && move_ts2rec) CMoviePlayerGui::getInstance().moveTimeshift(); else if (autoshift && g_settings.timeshift_delete) diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index 643508015..22b5b4cbc 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -220,12 +220,13 @@ void CStreamInstance::run() Send(r); } + CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM); + #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if(frontend) CFEManager::getInstance()->unlockFrontend(frontend); //CZapit::getInstance()->SetRecordMode(false); #endif - CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM); printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());