mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-06-07 16:20:47 +02:00
parent b3e71120b4 45f915dd39
commit ca83324763
80 changed files with 1972 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.h
View File

@@ -173,8 +173,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);