mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'

Browse Source 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
This commit is contained in:
Stefan Seyfried
2012-11-03 10:43:14 +01:00
parent 259533f809 7ea3a20a80
commit 7e23ac7223
123 changed files with 1901 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/infoviewer.h
View File

@@ -107,6 +107,8 @@ class CInfoViewer
CProgressBar *snrscale, *sigscale, *timescale;
bool casysChange;
bool channellogoChange;
uint32_t lcdUpdateTimer;
void paintBackground(int col_Numbox);
void show_Data( bool calledFromEvent = false );
void display_Info(const char *current, const char *next, bool UTF8 = true,
@@ -136,7 +138,6 @@ class CInfoViewer
bool chanready;
bool is_visible;
bool virtual_zap_mode;
uint32_t lcdUpdateTimer;
char aspectRatio;
uint32_t sec_timer_id;
@@ -171,6 +172,8 @@ class CInfoViewer
void showSNR();
void Init(void);
bool SDT_freq_update;
void setUpdateTimer(uint64_t interval);
uint32_t getUpdateTimer(void) { return lcdUpdateTimer; }
};
#if 0
class CInfoViewerHandler : public CMenuTarget