mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-12-28 12:32:12 +01:00
parent c8d0f6faaf 85fc0dd24c
commit 770e405c50
112 changed files with 2783 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.h
View File

@@ -89,8 +89,6 @@ class CInfoViewer
//uint32_t fadeTimer;
COSDFader fader;
int time_left_width;
int time_dot_width;
int time_width;
int time_height;
int info_time_width;
@@ -117,8 +115,8 @@ 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 initClock();
void paintTime( bool show_dot );
void showRecordIcon(const bool show);
void showIcon_Tuner() const;