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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/fb_accel.h
	src/driver/fb_accel_glfb.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/gui/bookmarkmanager.cpp
	src/gui/epgview.h
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/gui/widget/buttons.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 8f312e1d00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
This commit is contained in:
vanhofen
2017-02-12 23:50:14 +01:00
parent 207c82fe2f f166430b3d
commit bad03fe56c
12 changed files with 361 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/fb_generic.h
View File

@@ -176,7 +176,7 @@ class CFrameBuffer : public sigc::trackable
virtual fb_pixel_t * getBackBufferPointer() const; // pointer to backbuffer
virtual 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 getScreenHeight(bool real = false);
unsigned int getScreenWidthRel(bool force_small = false);
unsigned int getScreenHeightRel(bool force_small = false);
unsigned int getScreenX();
@@ -228,7 +228,7 @@ class CFrameBuffer : public sigc::trackable
void getIconSize(const char * const filename, int* width, int *height);
/* h is the height of the target "window", if != 0 the icon gets centered in that window */
bool paintIcon (const std::string & filename, const int x, const int y,
bool paintIcon (const std::string & filename, const int x, const int y,
const int h = 0, const unsigned char offset = 1, bool paint = true, bool paintBg = false, const fb_pixel_t colBg = 0);
bool paintIcon8(const std::string & filename, const int x, const int y, const unsigned char offset = 0);
void loadPal (const std::string & filename, const unsigned char offset = 0, const unsigned char endidx = 255);
@@ -304,6 +304,7 @@ class CFrameBuffer : public sigc::trackable
typedef std::vector<fb_area_t> v_fbarea_t;
typedef v_fbarea_t::iterator fbarea_iterator_t;
v_fbarea_t v_fbarea;
bool fb_no_check;
bool do_paint_mute_icon;
bool _checkFbArea(int _x, int _y, int _dx, int _dy, bool prev);