Mode fb and picviewer cleanup; unify channel logo display code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@259 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-05 15:26:57 +00:00
parent 2f6462c65d
commit 3fb6607ba0
16 changed files with 498 additions and 405 deletions

View File

@@ -122,9 +122,6 @@ class CFrameBuffer
static CFrameBuffer* getInstance();
int getIconWidth(const char * const filename); // infos about icon dimensions
int getIconHeight(const char * const filename);
void init(const char * const fbDevice = "/dev/fb/0");
int setMode(unsigned int xRes, unsigned int yRes, unsigned int bpp);
@@ -173,11 +170,10 @@ class CFrameBuffer
void setIconBasePath(const std::string & iconPath);
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 char * const filename, const int x, const int y,
const int h = 0, const unsigned char offset = 1);
bool paintIcon (const std::string & filename, const int x, const int y,
const int h = 0, const unsigned char offset = 1);
const int h = 0, const unsigned char offset = 1, bool paint = true);
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);
@@ -215,6 +211,9 @@ class CFrameBuffer
#else
inline void waitForIdle(void) {};
#endif
void* convertRGB2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y, int transp = 0xFF);
void displayRGB(unsigned char *rgbbuff, int x_size, int y_size, int x_pan, int y_pan, int x_offs, int y_offs, bool clearfb = true, int transp = 0xFF);
void blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp = 0, uint32_t yp = 0, bool transp = false);
bool blitToPrimary(unsigned int * data, int dx, int dy, int sw, int sh);
};