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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
* needs compile fixes
* needs additional tests, of course :-)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
parent 4cb5245546 9a9fc2097b
commit 13ab1ebc8a
346 changed files with 13372 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer.h
View File

@@ -112,6 +112,8 @@ class CInfoViewer
bool channellogoChange;
uint32_t lcdUpdateTimer;
int zap_mode;
std::string _livestreamInfo1;
std::string _livestreamInfo2;
void paintBackground(int col_Numbox);
void paintHead();
@@ -146,6 +148,8 @@ class CInfoViewer
void reset_allScala();
void check_channellogo_ca_SettingsChange();
void sendNoEpg(const t_channel_id channel_id);
bool showLivestreamInfo();
public:
bool chanready;
bool is_visible;
@@ -166,7 +170,7 @@ class CInfoViewer
void showMovieTitle(const int playState, const t_channel_id &channel_id, const std::string &title,
const std::string &g_file_epg, const std::string &g_file_epg1,
const int duration, const int curr_pos, const int repeat_mode);
const int duration, const int curr_pos, const int repeat_mode, const int _zap_mode = IV_MODE_DEFAULT);
void start();
void showEpgInfo();