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: 9613ee37d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-10 12:19:02 +02:00
parent 4f6f2b3133 5a06e8e04d
commit e00130c05b
2 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/epgview.h
View File

@@ -97,6 +97,7 @@ class CEpgData
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);
void showProgressBar();
bool isCurrentEPG(const t_channel_id channel_id);
//NI