mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

dont show logo if without Logo

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1490 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3daae6d569
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-05-24 (Tue, 24 May 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-05-24 15:11:35 +00:00
parent 25799ff3f1
commit 72e5188ea8
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/channellist.cpp
View File

@@ -1711,19 +1711,21 @@ void CChannelList::paintItem2DetailsLine (int pos, int /*ch_index*/)
void CChannelList::showChannelLogo() void CChannelList::showChannelLogo()
{ {
static int logo_w = 0; if(g_settings.infobar_show_channellogo){
static int logo_h = 0; static int logo_w = 0;
frameBuffer->paintBoxRel(x + width - logo_off - logo_w, y+(theight-logo_h)/2, logo_w, logo_h, COL_MENUHEAD_PLUS_0); static int logo_h = 0;
frameBuffer->paintBoxRel(x + width - logo_off - logo_w, y+(theight-logo_h)/2, logo_w, logo_h, COL_MENUHEAD_PLUS_0);
std::string lname; std::string lname;
if(g_PicViewer->GetLogoName(chanlist[selected]->channel_id, chanlist[selected]->name, lname, &logo_w, &logo_h)) { if(g_PicViewer->GetLogoName(chanlist[selected]->channel_id, chanlist[selected]->name, lname, &logo_w, &logo_h)) {
if(logo_h > theight) { if(logo_h > theight) {
if((theight/(logo_h-theight))>1) { if((theight/(logo_h-theight))>1) {
logo_w -= (logo_w/(theight/(logo_h-theight))); logo_w -= (logo_w/(theight/(logo_h-theight)));
}
logo_h = theight;
} }
logo_h = theight; g_PicViewer->DisplayImage(lname, x + width - logo_off - logo_w, y+(theight-logo_h)/2, logo_w, logo_h);
} }
g_PicViewer->DisplayImage(lname, x + width - logo_off - logo_w, y+(theight-logo_h)/2, logo_w, logo_h);
} }
} }

13
src/gui/epgview.cpp
View File

@@ -605,14 +605,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
std::string lname; std::string lname;
int logo_w = 0; int logo_w = 0;
int logo_h = 0; int logo_h = 0;
if(g_PicViewer->GetLogoName(channel_id, cit->second.getName(), lname, &logo_w, &logo_h)) { if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, cit->second.getName(), lname, &logo_w, &logo_h)) {
if(logo_h > toph){ if(logo_h > toph){
if((toph/(logo_h-toph))>1){ if((toph/(logo_h-toph))>1){
logo_w -= (logo_w/(toph/(logo_h-toph))); logo_w -= (logo_w/(toph/(logo_h-toph)));
}
logo_h = toph;
} }
logo_h = toph;
}
g_PicViewer->DisplayImage(lname, sx+10, sy + (toph-logo_h)/2/*5*/, logo_w, logo_h); g_PicViewer->DisplayImage(lname, sx+10, sy + (toph-logo_h)/2/*5*/, logo_w, logo_h);
pic_offx = logo_w + 10; pic_offx = logo_w + 10;
} }

4
src/gui/eventlist.cpp
View File

@@ -834,7 +834,7 @@ void EventList::paintHead(t_channel_id _channel_id, std::string _channelname)
std::string lname; std::string lname;
int logo_w = 0; int logo_w = 0;
int logo_h = 0; int logo_h = 0;
if(g_PicViewer->GetLogoName(_channel_id, _channelname, lname, &logo_w, &logo_h)){ if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(_channel_id, _channelname, lname, &logo_w, &logo_h)){
if(logo_h > theight){ if(logo_h > theight){
if((theight/(logo_h-theight))>1){ if((theight/(logo_h-theight))>1){
logo_w -= (logo_w/(theight/(logo_h-theight))); logo_w -= (logo_w/(theight/(logo_h-theight)));
@@ -843,7 +843,7 @@ void EventList::paintHead(t_channel_id _channel_id, std::string _channelname)
} }
logo_ok = g_PicViewer->DisplayImage(lname, x+10, y+(theight-logo_h)/2, logo_w, logo_h); logo_ok = g_PicViewer->DisplayImage(lname, x+10, y+(theight-logo_h)/2, logo_w, logo_h);
} }
else else
g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->RenderString(x+15+(logo_ok? 5+logo_w:0),y+theight+1, width, _channelname.c_str(), COL_MENUHEAD, 0, true); // UTF-8 g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->RenderString(x+15+(logo_ok? 5+logo_w:0),y+theight+1, width, _channelname.c_str(), COL_MENUHEAD, 0, true); // UTF-8
} }