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

Merge branch 'check/pu-cc' into master

Browse Source 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
This commit is contained in:
Stefan Seyfried
2013-04-06 11:21:55 +02:00
parent dd6d2b8999 864c0c2bee
commit f1e664b75e
76 changed files with 4450 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/framebuffer.h
View File

@@ -57,6 +57,9 @@ typedef struct fb_var_screeninfo t_fb_var_screeninfo;
#define FADE_STEP 5
#define FADE_RESET 0xFFFF
#define NON_BIG_WINDOWS 85 // %
#define ConnectLineBox_Width 16 // px
#if HAVE_GENERIC_HARDWARE
#define USE_OPENGL 1
#endif
@@ -160,6 +163,8 @@ class CFrameBuffer
unsigned int getStride() const; // size of a single line in the framebuffer (in bytes)
unsigned int getScreenWidth(bool real = false);
unsigned int getScreenHeight(bool real = false);
unsigned int getScreenWidthRel();
unsigned int getScreenHeightRel();
unsigned int getScreenX();
unsigned int getScreenY();