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 branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h
	src/driver/rcinput.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/update.h
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 33441c2ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
This commit is contained in:
vanhofen
2017-02-26 00:45:36 +01:00
parent 59a5f1ad6b 80b1782d62
commit 4f4c656b55
7 changed files with 11 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/fb_generic.h
View File

@@ -183,7 +183,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();
@@ -192,7 +192,6 @@ class CFrameBuffer : public sigc::trackable
bool getActive() const; // is framebuffer active?
void setActive(bool enable); // is framebuffer active?
virtual void setupGXA() { return; }; // reinitialize stuff
virtual void add_gxa_sync_marker() { return; };
virtual bool needAlign4Blit() { return false; };
virtual uint32_t getWidth4FB_HW_ACC(const uint32_t x, const uint32_t w, const bool max=true);
@@ -235,7 +234,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);