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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-03 22:57:24 +02:00
parent 4a8d040937 694dd0d5e1
commit 43e622513a
11 changed files with 273 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/epgview.h
View File

@@ -51,9 +51,13 @@ class CEpgData
CChannelEventList evtlist;
CChannelEventList followlist;
CEPGData epgData;
CComponentsShapeSquare* header;
CIMDB *imdb; //NI
CComponentsHeader *header;
CComponentsFrmChain *Bottombox;
CComponentsPictureScalable *lpic, *rpic;
CComponentsText *lText, *rText;
CProgressBar *pb;
std::string epg_date;
std::string epg_start;
std::string epg_end;
@@ -112,6 +116,7 @@ class CEpgData
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 *mi, int mp_position = 0, int mp_duration = 0, bool doLoop = true);
void hide();
void ResetModules();
};