mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +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: 28331cc635
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-31 16:24:39 +02:00
parent d5953343ea caf8b38616
commit bc3485e0f0
2 changed files with 75 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/epgview.h
View File

@@ -83,6 +83,7 @@ class CEpgData
typedef std::pair<std::string,int> epg_pair;
std::vector<epg_pair> epgText;
std::vector<epg_pair> epgText_saved;
std::string epgTextSwitch;
int topheight,topboxheight;
int buttonheight,botboxheight;
int medlineheight,medlinecount;
@@ -94,7 +95,7 @@ class CEpgData
void showText( int startPos, int ypos, bool 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);
void showTimerEventBar(bool show, bool adzap = false, bool mp_info = false);
bool isCurrentEPG(const t_channel_id channel_id);
//NI
@@ -109,7 +110,7 @@ class CEpgData
CEpgData();
~CEpgData();
void start( );
int show(const t_channel_id channel_id, uint64_t id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false );
int show(const t_channel_id channel_id, uint64_t id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false, bool mp_info = false );
int show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position = 1, int mp_duration = 1, bool doLoop = true);
void hide();
};