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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
parent dff4ea2892 bf56f9f0bc
commit 5e5451332e
27 changed files with 348 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.h
View File

@@ -184,8 +184,8 @@ class CInfoViewer
void start();
void showEpgInfo();
void showTitle(CZapitChannel * channel, const bool calledFromNumZap = false, int epgpos = 0);
void showTitle(t_channel_id channel_id, const bool calledFromNumZap = false, int epgpos = 0);
void showTitle(CZapitChannel * channel, const bool calledFromNumZap = false, int epgpos = 0, bool forcePaintButtonBar = false);
void showTitle(t_channel_id channel_id, const bool calledFromNumZap = false, int epgpos = 0, bool forcePaintButtonBar = false);
void lookAheadEPG(const int ChanNum, const std::string & Channel, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false); //alpha: fix for nvod subchannel update
void killTitle();
void getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info);