Merge branch 'check/next-cc'

Only compile-tested.
This commit is contained in:
Stefan Seyfried
2013-11-30 20:17:31 +01:00
83 changed files with 913 additions and 652 deletions

View File

@@ -44,6 +44,7 @@
#include <gui/infoviewer_bb.h>
#include <string>
#include <zapit/channel.h>
#include <gui/components/cc.h>
class CInfoViewer
{
@@ -51,6 +52,7 @@ class CInfoViewer
CFrameBuffer * frameBuffer;
CInfoViewerBB* infoViewerBB;
CComponentsFrmClock *clock;
bool gotTime;
bool recordModeActive;
@@ -116,7 +118,7 @@ class CInfoViewer
const char *runningStart = NULL, const char *runningRest = NULL,
const char *nextStart = NULL, const char *nextDuration = NULL,
bool update_current = true, bool update_next = true);
void paintTime( bool show_dot, bool firstPaint );
void paintTime( bool show_dot );
void showRecordIcon(const bool show);
void showIcon_Tuner() const;
@@ -157,7 +159,7 @@ class CInfoViewer
CInfoViewer();
~CInfoViewer();
void showMovieTitle(const int playState, const std::string &title,
void showMovieTitle(const int playState, const t_channel_id &channel_id, const std::string &title,
const std::string &g_file_epg, const std::string &g_file_epg1,
const int duration, const int curr_pos);