mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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, "");
|
||||
|
Reference in New Issue
Block a user