compil fix for commit 263340cd22

Origin commit data
------------------
Branch: ni/coolstream
Commit: deeed028d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2013-01-30 19:31:57 +01:00
parent 263340cd22
commit f6f0911121

View File

@@ -2089,11 +2089,11 @@ 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)
@@ -2113,7 +2113,6 @@ void CChannelList::paint_events(int index)
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; int i=1;
@@ -2141,7 +2140,10 @@ void CChannelList::paint_events(int index)
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, 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+timewidth+5, y+ theight+ pig_height + i*ffheight, infozone_width - timewidth - 20, e->description, COL_MENUCONTENTDARK, 0, true);
} }
else break; else
{
break;
}
i++; i++;
} }
evtlist.clear(); evtlist.clear();