mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove globals and use new zapit class members

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c6c2e9b29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-09-18 (Sun, 18 Sep 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-09-18 13:35:08 +00:00
parent 1e367e1f61
commit 2c8c81b5c8
15 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/scan.cpp
View File

@@ -82,7 +82,6 @@ CScanTs::CScanTs()
snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT);
}
extern int scan_pids;
extern int scan_fta_flag;//in zapit descriptors definiert
extern int start_fast_scan(int scan_mode, int opid);
#include <zapit/getservices.h>
@@ -177,7 +176,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
CZapitClient::ScanSatelliteList satList;
CZapitClient::commandSetScanSatelliteList sat;
int _scan_pids = scan_pids;
int _scan_pids = CZapit::getInstance()->scanPids();
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
@@ -211,7 +210,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
//printf("[neutrino] scan_mode %d TP_freq %s TP_rate %s TP_fec %d TP_pol %d\n", scansettings.scan_mode, scansettings.TP_freq, scansettings.TP_rate, scansettings.TP_fec, scansettings.TP_pol);
if(manual) {
scan_pids = true;
CZapit::getInstance()->scanPids(true);
TP.scan_mode = scansettings.scan_mode;
TP.feparams.frequency = atoi(scansettings.TP_freq);
if(g_info.delivery_system == DVB_S) {
@@ -344,7 +343,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
hide();
scan_pids = _scan_pids;
CZapit::getInstance()->scanPids(_scan_pids);
videoDecoder->StopPicture();
frameBuffer->Clear();
g_Sectionsd->setPauseScanning(false);