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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
parent 44ae8a088c 790508f5e0
commit d8d4d753a5
58 changed files with 6498 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/channellist.cpp
View File

@@ -1700,6 +1700,7 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade
return;
if(g_settings.channellist_show_channellogo){
int logo_w_max = full_width / 4;
int logo_h_max = theight - 2*OFFSET_INNER_MIN;
if (CChannelLogo) {
if (headerNew)
CChannelLogo->clearSavedScreen();
@@ -1711,8 +1712,8 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade
if (CChannelLogo->hasLogo()){
CChannelLogo->setWidth(min(CChannelLogo->getWidth(), logo_w_max), true);
if (CChannelLogo->getHeight() > theight) //scale image if required
CChannelLogo->setHeight(theight, true);
if (CChannelLogo->getHeight() > logo_h_max)
CChannelLogo->setHeight(logo_h_max, true);
CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth());
CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2);
CChannelLogo->paint();
@@ -2340,7 +2341,7 @@ void CChannelList::paint_events()
int current_index = paint_events_index;
CChannelEventList evtlist;
readEvents((*chanlist)[current_index]->getChannelID(), evtlist);
readEvents((*chanlist)[current_index]->getEpgID(), evtlist);
if (current_index == paint_events_index) {
pthread_mutex_lock(&paint_events_mutex);
if (current_index == paint_events_index)