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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-05-24 20:24:39 +02:00
parent 95813ab60e 00dd399ff9
commit a7f1e0e25e
50 changed files with 1106 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/infoviewer.cpp
View File

@@ -535,7 +535,7 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
paintTime (show_dot, true);
showRecordIcon (show_dot);
show_dot = !show_dot;
showInfoFile();
infoViewerBB->paintshowButtonBar();
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(ChanNameX + 10 , ChanNameY + time_height,BoxEndX - (ChanNameX + 20) - time_width - LEFT_OFFSET - 5 ,ChannelName, COL_INFOBAR, 0, true); // UTF-8
@@ -593,6 +593,8 @@ void CInfoViewer::showMovieTitle(const int playState, const std::string &Channel
frameBuffer->paintIcon(playicon, icon_x, icon_y);
showLcdPercentOver ();
showInfoFile();
//loop(fadeValue, show_dot , fadeIn);
loop(show_dot);
aspectRatio = 0;
@@ -693,7 +695,6 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
showRecordIcon (show_dot);
show_dot = !show_dot;
showInfoFile();
if (showButtonBar) {
infoViewerBB->paintshowButtonBar();
}
@@ -790,7 +791,9 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
} else {
show_current_next(new_chan,epgpos);
}
showLcdPercentOver ();
showInfoFile();
#if 0
if ((g_RemoteControl->current_channel_id == channel_id) && !(((info_CurrentNext.flags & CSectionsdClient::epgflags::has_next) && (info_CurrentNext.flags & (CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::has_no_current))) || (info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast))) {
@@ -1859,12 +1862,17 @@ void CInfoViewer::showInfoFile()
return;
}
//get width of progressbar timescale
int pb_w = 0;
if ( (timescale != NULL) && (g_settings.infobar_progressbar == 0) ) {
pb_w = timescale->getWidth();
}
//set position of info area
const int oOffset = 140; // outer left/right offset
const int pb_w = 112; // same value as int pb_w in display_Info()
const int xStart = BoxStartX + ChanWidth + oOffset;
const int yStart = BoxStartY;
const int width = BoxEndX - xStart - (g_settings.infobar_progressbar ? oOffset : oOffset + pb_w);
const int width = BoxEndX - xStart - oOffset - pb_w;
const int height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getHeight() + 2;
//create info object