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

Merge branch 'pip' into next

Browse Source 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-02-28 16:45:41 +04:00
parent d0ccb2c97d 0acf12c5f9
commit 632df4ddb3
22 changed files with 494 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/scan.cpp
View File

@@ -200,6 +200,9 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
CRecordManager::getInstance()->StopAutoRecord();
g_Zapit->stopPlayBack();
#ifdef BOXMODEL_APOLLO
CZapit::getInstance()->StopPip();
#endif
frameBuffer->paintBackground();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/scan.jpg");
@@ -342,6 +345,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
videoDecoder->StopPicture();
frameBuffer->Clear();
g_Sectionsd->setPauseScanning(false);
CNeutrinoApp::getInstance()->channelList->setSelected(0xfffffff);
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(CZapit::getInstance()->GetCurrentChannelID());
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
return menu_return::RETURN_REPAINT;