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
	src/gui/infoviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-29 20:55:15 +02:00
parent d53a38cd72 b1998476ba
commit 7cfc6ad001
9 changed files with 435 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.h
View File

@@ -40,6 +40,7 @@
#include <gui/imdb.h> //NI
#include <gui/color.h>
#include <gui/movieinfo.h>
#include "widget/menue.h"
#include <sectionsdclient/sectionsdclient.h>
@@ -109,6 +110,7 @@ class 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_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position = 1, int mp_duration = 1, bool doLoop = true);
void hide();
};