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 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 61712bcdf2 151d7f25a4
commit 5f89c9a312
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/scan.cpp
View File

@@ -207,7 +207,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
#endif
frameBuffer->paintBackground();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/scan.jpg");
frameBuffer->showFrame("scan.jpg");
g_Sectionsd->setPauseScanning(true);
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
@@ -368,7 +368,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
hide();
CZapit::getInstance()->scanPids(scan_pids);
videoDecoder->StopPicture();
frameBuffer->stopFrame();
frameBuffer->Clear();
g_Sectionsd->setPauseScanning(false);
if (CNeutrinoApp::getInstance()->channelList)