Merge branch 'uncool/dvbsi++'

Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h
This commit is contained in:
Stefan Seyfried
2012-11-11 00:40:30 +01:00
55 changed files with 1446 additions and 881 deletions

View File

@@ -49,6 +49,10 @@ CProgressWindow::CProgressWindow()
global_progress = local_progress = 101;
statusText = "";
globalstatusX = 0;
globalstatusY = 0;
localstatusY = 0;
statusTextY = 0;
x = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth() - width ) >> 1 );
y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - height) >>1 );