mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'

Browse Source 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
This commit is contained in:
Stefan Seyfried
2012-11-03 10:43:14 +01:00
parent 259533f809 7ea3a20a80
commit 7e23ac7223
123 changed files with 1901 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/infoviewer.cpp
View File

@@ -136,6 +136,7 @@ void CInfoViewer::Init()
channel_id = CZapit::getInstance()->GetCurrentChannelID();;
lcdUpdateTimer = 0;
rt_x = rt_y = rt_h = rt_w = 0;
}
/*
@@ -199,10 +200,6 @@ void CInfoViewer::start ()
time_left_width = 2 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getWidth(); /* still a kludge */
time_dot_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(":");
time_width = time_left_width* 2+ time_dot_width;
const int lcd_update_time_tv_mode = (60 * 1000 * 1000);
if (lcdUpdateTimer == 0)
lcdUpdateTimer = g_RCInput->addTimer (lcd_update_time_tv_mode, false, true);
}
void CInfoViewer::changePB()
@@ -1008,7 +1005,9 @@ void CInfoViewer::showMotorMoving (int duration)
void CInfoViewer::killRadiotext()
{
frameBuffer->paintBackgroundBox(rt_x, rt_y, rt_w, rt_h);
if (g_Radiotext->S_RtOsd)
frameBuffer->paintBackgroundBox(rt_x, rt_y, rt_w, rt_h);
rt_x = rt_y = rt_h = rt_w = 0;
frameBuffer->blit();
}
@@ -1149,7 +1148,6 @@ void CInfoViewer::showRadiotext()
}
int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
{
if ((msg == NeutrinoMessages::EVT_CURRENTNEXT_EPG) || (msg == NeutrinoMessages::EVT_NEXTPROGRAM)) {
@@ -1955,6 +1953,13 @@ void CInfoViewer::showEpgInfo() //message on event change
}
}
void CInfoViewer::setUpdateTimer(uint64_t interval)
{
g_RCInput->killTimer(lcdUpdateTimer);
if (interval)
lcdUpdateTimer = g_RCInput->addTimer(interval, false);
}
#if 0
int CInfoViewerHandler::exec (CMenuTarget * parent, const std::string & /*actionkey*/)
{