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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e3842cb51
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-02 11:26:37 +02:00
parent 4bc4e9c271 9786102aa8
commit de162753a5
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.h
View File

@@ -92,7 +92,7 @@ class CEpgData
void GetPrevNextEPGData( uint64_t id, time_t* startzeit );
void addTextToArray( const std::string & text, int screening );
void processTextToArray(std::string text, int screening = 0, bool has_cover = false);
void showText( int startPos, int ypos, bool cover=false, bool fullClear=true );
void showText(int startPos, int ypos, bool has_cover = false, bool fullClear = true);
bool hasFollowScreenings(const t_channel_id channel_id, const std::string & title);
int FollowScreenings(const t_channel_id channel_id, const std::string & title);
void showTimerEventBar(bool show, bool adzap = false, bool mp_info = false);