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

@@ -96,7 +96,24 @@ CInfoViewer::CInfoViewer ()
info_CurrentNext.flags = 0;
frameBuffer = CFrameBuffer::getInstance();
infoViewerBB = CInfoViewerBB::getInstance();
InfoHeightY = 0;
ButtonWidth = 0;
rt_dx = 0;
rt_dy = 0;
ChanNameX = 0;
ChanNameY = 0;
ChanWidth = 0;
ChanHeight = 0;
time_left_width = 0;
time_dot_width = 0;
time_width = 0;
time_height = 0;
old_timestr[0] = 0;
lastsnr = 0;
lastsig = 0;
lasttime = 0;
aspectRatio = 0;
ChanInfoX = 0;
Init();
infoViewerBB->Init();
strcpy(old_timestr, "");