From 0422f2b43de1eab6e07db74ca0129560a651e24a Mon Sep 17 00:00:00 2001 From: focus Date: Thu, 1 Sep 2011 12:29:05 +0000 Subject: [PATCH] use CZapit class git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1651 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/scan.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 9d574ef40..29a2f3a0b 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -59,6 +59,7 @@ #include #include +#include #include extern cVideo * videoDecoder; @@ -200,7 +201,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) return menu_return::RETURN_EXIT_ALL; CRecordManager::getInstance()->StopAutoRecord(); - g_Zapit->stopPlayBack(); + g_Zapit->stopPlayBack(); frameBuffer->paintBackground(); videoDecoder->ShowPicture(DATADIR "/neutrino/icons/scan.jpg"); g_Sectionsd->setPauseScanning(true); @@ -276,7 +277,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) } else if(manual) success = g_Zapit->scan_TP(TP); else if(fast) { - success = !start_fast_scan(scansettings.fast_type, scansettings.fast_op); + success = CZapit::getInstance()->StartFastScan(scansettings.fast_type, scansettings.fast_op); } else success = g_Zapit->startScan(scan_mode); @@ -316,6 +317,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) while (!(msg == CRCInput::RC_timeout)); showSNR(); // FIXME commented until scan slowdown will be solved } + /* to join scan thread */ + g_Zapit->stopScan(); if(!manual) { if (system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)