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

moviebrowser: check for channelname too to change channellogo; ...

Browse Source 
usefull for popup-channels with same id but different names


Origin commit data
------------------
Commit: 59070b3120
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-06-05 (Tue, 05 Jun 2018)

Origin message was:
------------------
- moviebrowser: check for channelname too to change channellogo; ...

usefull for popup-channels with same id but different names
This commit is contained in:
vanhofen
2018-06-05 23:11:22 +02:00
parent ec7163afa9
commit 54c6a548a8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/moviebrowser/mb.cpp
View File

@@ -425,6 +425,8 @@ void CMovieBrowser::init(void)
m_movieCover = NULL; m_movieCover = NULL;
old_EpgId = 0; old_EpgId = 0;
old_ChannelName.clear();
m_doRefresh = false; m_doRefresh = false;
m_doLoadMovies = false; m_doLoadMovies = false;
@@ -1183,6 +1185,7 @@ void CMovieBrowser::hide(void)
delete m_header; m_header = NULL; delete m_header; m_header = NULL;
} }
old_EpgId = 0; old_EpgId = 0;
old_ChannelName.clear();
framebuffer->paintBackground(); framebuffer->paintBackground();
if (m_pcFilter != NULL) if (m_pcFilter != NULL)
m_currentFilterSelection = m_pcFilter->getSelectedLine(); m_currentFilterSelection = m_pcFilter->getSelectedLine();
@@ -1406,7 +1409,7 @@ void CMovieBrowser::refreshChannelLogo(void)
if (show_mode == MB_SHOW_YT) if (show_mode == MB_SHOW_YT)
pb_hdd_offset = 0; pb_hdd_offset = 0;
if (m_channelLogo && (old_EpgId != m_movieSelectionHandler->epgId >> 16)) if (m_channelLogo && (old_EpgId != m_movieSelectionHandler->epgId >> 16 || old_ChannelName != m_movieSelectionHandler->channelName))
{ {
if (newHeader) if (newHeader)
m_channelLogo->clearFbData(); // reset logo screen data m_channelLogo->clearFbData(); // reset logo screen data
@@ -1416,11 +1419,12 @@ void CMovieBrowser::refreshChannelLogo(void)
m_channelLogo = NULL; m_channelLogo = NULL;
} }
if (old_EpgId != m_movieSelectionHandler->epgId >> 16) if (old_EpgId != m_movieSelectionHandler->epgId >> 16 || old_ChannelName != m_movieSelectionHandler->channelName)
{ {
if (m_channelLogo == NULL) if (m_channelLogo == NULL)
m_channelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->channelName, m_movieSelectionHandler->epgId >>16); //TODO: add logo into header as item m_channelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->channelName, m_movieSelectionHandler->epgId >>16); //TODO: add logo into header as item
old_EpgId = m_movieSelectionHandler->epgId >> 16; old_EpgId = m_movieSelectionHandler->epgId >> 16;
old_ChannelName = m_movieSelectionHandler->channelName;
} }
if (m_channelLogo && m_channelLogo->hasLogo()) if (m_channelLogo && m_channelLogo->hasLogo())

2
src/gui/moviebrowser/mb.h
View File

@@ -223,6 +223,8 @@ class CMovieBrowser : public CMenuTarget, public CProgressSignals
P_MI_MOVIE_LIST movielist; P_MI_MOVIE_LIST movielist;
uint64_t old_EpgId; uint64_t old_EpgId;
std::string old_ChannelName;
int movieInfoUpdateAll[MB_INFO_MAX_NUMBER]; int movieInfoUpdateAll[MB_INFO_MAX_NUMBER];
int movieInfoUpdateAllIfDestEmptyOnly; int movieInfoUpdateAllIfDestEmptyOnly;