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

Merge branch 'uncool/dvbsi++' commit '9d968280bac'

Browse Source 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
parent 2da175a159 9d968280ba
commit 3df9a6f7f5
354 changed files with 17604 additions and 32020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/driver/fb_window.cpp
View File

@@ -31,13 +31,6 @@
#include <driver/fontrenderer.h>
#include <driver/framebuffer.h>
class CPrivateData
{
public:
CFrameBuffer * frameBuffer;
fb_pixel_t * Background;
};
CFBWindow::CFBWindow(const int _x, const int _y, const int _dx, const int _dy)
{
x = _x ;
@@ -45,44 +38,35 @@ CFBWindow::CFBWindow(const int _x, const int _y, const int _dx, const int _dy)
dx = _dx;
dy = _dy;
private_data = (void *) new CPrivateData;
((CPrivateData *)private_data)->frameBuffer = CFrameBuffer::getInstance();
((CPrivateData *)private_data)->Background = new fb_pixel_t [_dx * _dy];
if (((CPrivateData *)private_data)->Background != NULL)
((CPrivateData *)private_data)->frameBuffer->SaveScreen(_x, _y, _dx, _dy, ((CPrivateData *)private_data)->Background);
frameBuffer = CFrameBuffer::getInstance();
Background = new fb_pixel_t [_dx * _dy];
if (Background != NULL)
frameBuffer->SaveScreen(_x, _y, _dx, _dy, Background);
}
CFBWindow::~CFBWindow(void)
{
if (private_data != NULL)
{
if (((CPrivateData *)private_data)->Background != NULL)
{
((CPrivateData *)private_data)->frameBuffer->RestoreScreen(x, y, dx, dy, ((CPrivateData *)private_data)->Background);
((CPrivateData *)private_data)->frameBuffer->blit();
}
delete[] ((CPrivateData *)private_data)->Background;
delete ((CPrivateData *)private_data);
private_data = NULL;
}
if (Background != NULL)
frameBuffer->RestoreScreen(x, y, dx, dy, Background);
delete[] Background;
}
void CFBWindow::paintBoxRel(const int _x, const int _y, const int _dx, const int _dy, const color_t _col, int radius, int type)
{
((CPrivateData *)private_data)->frameBuffer->paintBoxRel(x + _x, y + _y, _dx, _dy, _col, radius, type);
((CPrivateData *)private_data)->frameBuffer->blit();
frameBuffer->paintBoxRel(x + _x, y + _y, _dx, _dy, _col, radius, type);
frameBuffer->blit();
}
bool CFBWindow::paintIcon(const char * const _filename, const int _x, const int _y, const int _h, const color_t _offset)
{
((CPrivateData *)private_data)->frameBuffer->paintIcon(_filename, x + _x, y + _y, _h, _offset);
((CPrivateData *)private_data)->frameBuffer->blit();
frameBuffer->paintIcon(_filename, x + _x, y + _y, _h, _offset);
frameBuffer->blit();
return 0;
}
void CFBWindow::RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight, const bool _utf8_encoded)
{
((Font *)_font)->RenderString(x + _x, y + _y, _width, _text, _color, _boxheight, _utf8_encoded);
((CPrivateData *)private_data)->frameBuffer->blit();
frameBuffer->blit();
}