webtv channels integration port,

initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-08-27 17:32:26 +04:00
parent e11aa7a161
commit 40dae113bc
49 changed files with 1000 additions and 190 deletions

View File

@@ -44,6 +44,7 @@
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <gui/components/cc.h>
#include <gui/movieplayer.h>
#include <system/settings.h>
#include <system/helpers.h>
@@ -58,6 +59,7 @@
#include <zapit/zapit.h>
#include <zapit/getservices.h>
#include <video.h>
extern cVideo * videoDecoder;
#define NEUTRINO_SCAN_START_SCRIPT CONFIGDIR "/scan.start"
@@ -197,7 +199,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
return menu_return::RETURN_EXIT_ALL;
CRecordManager::getInstance()->StopAutoRecord();
g_Zapit->stopPlayBack();
CNeutrinoApp::getInstance()->stopPlayBack();
#ifdef ENABLE_PIP
CZapit::getInstance()->StopPip();
#endif