mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
moviebrowser: check for channelname too to change channellogo; ...
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:
@@ -425,6 +425,8 @@ void CMovieBrowser::init(void)
|
||||
m_movieCover = NULL;
|
||||
|
||||
old_EpgId = 0;
|
||||
old_ChannelName.clear();
|
||||
|
||||
m_doRefresh = false;
|
||||
m_doLoadMovies = false;
|
||||
|
||||
@@ -1183,6 +1185,7 @@ void CMovieBrowser::hide(void)
|
||||
delete m_header; m_header = NULL;
|
||||
}
|
||||
old_EpgId = 0;
|
||||
old_ChannelName.clear();
|
||||
framebuffer->paintBackground();
|
||||
if (m_pcFilter != NULL)
|
||||
m_currentFilterSelection = m_pcFilter->getSelectedLine();
|
||||
@@ -1406,7 +1409,7 @@ void CMovieBrowser::refreshChannelLogo(void)
|
||||
if (show_mode == MB_SHOW_YT)
|
||||
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)
|
||||
m_channelLogo->clearFbData(); // reset logo screen data
|
||||
@@ -1416,11 +1419,12 @@ void CMovieBrowser::refreshChannelLogo(void)
|
||||
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)
|
||||
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_ChannelName = m_movieSelectionHandler->channelName;
|
||||
}
|
||||
|
||||
if (m_channelLogo && m_channelLogo->hasLogo())
|
||||
|
Reference in New Issue
Block a user