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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent c0910d6be4 a41206902f
commit 3f75ef5f47
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/scan.cpp
View File

@@ -50,8 +50,6 @@
#include <global.h>
#include <neutrino.h>
#include <gui/customcolor.h>
#include <zapit/femanager.h>
#include <zapit/scan.h>
#include <zapit/zapit.h>
@@ -215,7 +213,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) {
CZapit::getInstance()->scanPids(true);
CZapit::getInstance()->scanPids(scan_pids);
if(scansettings.scan_nit_manual)
scan_flags |= CServiceScan::SCAN_NIT;
TP.scan_mode = scan_flags;