mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

use CZapit class

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1651 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-09-01 12:29:05 +00:00
parent 0087dbc950
commit 0422f2b43d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/scan.cpp
View File

@@ -59,6 +59,7 @@
#include <zapit/satconfig.h> #include <zapit/satconfig.h>
#include <zapit/frontend_c.h> #include <zapit/frontend_c.h>
#include <zapit/zapit.h>
#include <video.h> #include <video.h>
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
@@ -200,7 +201,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
CRecordManager::getInstance()->StopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
g_Zapit->stopPlayBack(); g_Zapit->stopPlayBack();
frameBuffer->paintBackground(); frameBuffer->paintBackground();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/scan.jpg"); videoDecoder->ShowPicture(DATADIR "/neutrino/icons/scan.jpg");
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);
@@ -276,7 +277,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
} else if(manual) } else if(manual)
success = g_Zapit->scan_TP(TP); success = g_Zapit->scan_TP(TP);
else if(fast) { else if(fast) {
success = !start_fast_scan(scansettings.fast_type, scansettings.fast_op); success = CZapit::getInstance()->StartFastScan(scansettings.fast_type, scansettings.fast_op);
} }
else else
success = g_Zapit->startScan(scan_mode); success = g_Zapit->startScan(scan_mode);
@@ -316,6 +317,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
while (!(msg == CRCInput::RC_timeout)); while (!(msg == CRCInput::RC_timeout));
showSNR(); // FIXME commented until scan slowdown will be solved showSNR(); // FIXME commented until scan slowdown will be solved
} }
/* to join scan thread */
g_Zapit->stopScan();
if(!manual) { if(!manual) {
if (system(NEUTRINO_SCAN_STOP_SCRIPT) != 0) if (system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)