mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

compil fix for commit 1a425308ed

Browse Source
This commit is contained in:
satbaby
2013-01-30 19:31:57 +01:00
parent 1a425308ed
commit deeed028d4
1 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/gui/channellist.cpp
View File

@@ -2002,7 +2002,7 @@ void CChannelList::paint()
{ {
if (g_settings.channellist_minitv) if (g_settings.channellist_minitv)
{ {
paint_pig(x+width, y+theight+1, pig_width, pig_height); paint_pig(x+width, y+theight+1, pig_width, pig_height);
} }
numwidth = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(MaxChanNr().c_str()); numwidth = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(MaxChanNr().c_str());
@@ -2089,67 +2089,69 @@ std::string CChannelList::MaxChanNr()
return maxchansize; return maxchansize;
} }
void CChannelList::paint_pig (int x, int y, int w, int h) void CChannelList::paint_pig (int _x, int _y, int w, int h)
{ {
frameBuffer->paintBackgroundBoxRel (x, y, w, h); frameBuffer->paintBackgroundBoxRel (_x, _y, w, h);
printf("CChannelList::paint_pig x %d y %d w %d h %d osd_w %d osd_w %d\n", x, y, w, h, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); printf("CChannelList::paint_pig x %d y %d w %d h %d osd_w %d osd_w %d\n", _x, _y, w, h, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
videoDecoder->Pig(x, y, w, h, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); videoDecoder->Pig(_x, _y, w, h, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
} }
void CChannelList::paint_events(int index) void CChannelList::paint_events(int index)
{ {
readEvents(chanlist[index]->channel_id); readEvents(chanlist[index]->channel_id);
frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUHEAD_PLUS_0); frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUHEAD_PLUS_0);
char text1[10]; char text1[10];
CChannelEventList::iterator e; CChannelEventList::iterator e;
time_t azeit; time_t azeit;
time(&azeit); time(&azeit);
int ffheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getHeight(); int ffheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getHeight();
if ( evtlist.size() == 0 ) if ( evtlist.size() == 0 )
{ {
CChannelEvent evt; CChannelEvent evt;
evt.description = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS); evt.description = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
evt.eventID = 0; evt.eventID = 0;
evtlist.push_back(evt); evtlist.push_back(evt);
}
} int i=1;
for (e=evtlist.begin(); e!=evtlist.end(); ++e )
int i=1; {
for (e=evtlist.begin(); e!=evtlist.end(); ++e ) //Remove events in the past
{ time_t dif = azeit - e->startTime;
//Remove events in the past if ( (dif > 0) && (!(e->eventID == 0)))
time_t dif = azeit - e->startTime; {
if ( (dif > 0) && (!(e->eventID == 0))) do
{ {
do //printf("%d seconds in the past - deleted %s\n", dif, e->description.c_str());
{ e = evtlist.erase(e);
//printf("%d seconds in the past - deleted %s\n", dif, e->description.c_str()); dif = azeit - e->startTime;
e = evtlist.erase(e); }
dif = azeit - e->startTime; while ( dif > 0 );
} }
while ( dif > 0 ); //Display the remaining events
} struct tm *tmStartZeit = localtime(&e->startTime);
//Display the remaining events strftime(text1, sizeof(text1), "%H:%M", tmStartZeit );
struct tm *tmStartZeit = localtime(&e->startTime); //printf("%s %s\n", text1, e->description.c_str());
strftime(text1, sizeof(text1), "%H:%M", tmStartZeit ); int timewidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getRenderWidth(text1, true);
//printf("%s %s\n", text1, e->description.c_str()); if ((y+ theight+ pig_height + i*ffheight) < (y+ height))
int timewidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getRenderWidth(text1, true); {
if ((y+ theight+ pig_height + i*ffheight) < (y+ height)) g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(x+ width+5, y+ theight+ pig_height + i*ffheight, timewidth, text1, COL_MENUCONTENTDARK, 0, true);
{ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(x+ width+5+timewidth+5, y+ theight+ pig_height + i*ffheight, infozone_width - timewidth - 20, e->description, COL_MENUCONTENTDARK, 0, true);
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(x+ width+5, y+ theight+ pig_height + i*ffheight, timewidth, text1, COL_MENUCONTENTDARK, 0, true); }
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(x+ width+5+timewidth+5, y+ theight+ pig_height + i*ffheight, infozone_width - timewidth - 20, e->description, COL_MENUCONTENTDARK, 0, true); else
} {
else break; break;
i++; }
} i++;
}
evtlist.clear(); evtlist.clear();
} }
static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b) static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
{ {
return a.startTime < b.startTime; return a.startTime < b.startTime;
} }
void CChannelList::readEvents(const t_channel_id channel_id) void CChannelList::readEvents(const t_channel_id channel_id)