From 54c6a548a82923ea7d5e49ceb1552f283691d909 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 5 Jun 2018 23:11:22 +0200 Subject: [PATCH] moviebrowser: check for channelname too to change channellogo; ... usefull for popup-channels with same id but different names Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/59070b31204f0f92918e979d939435472778255b Author: vanhofen 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 --- src/gui/moviebrowser/mb.cpp | 8 ++++++-- src/gui/moviebrowser/mb.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index c3e182552..35bdd10bc 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -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()) diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index 4b57afd47..d51cca4a2 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -223,6 +223,8 @@ class CMovieBrowser : public CMenuTarget, public CProgressSignals P_MI_MOVIE_LIST movielist; uint64_t old_EpgId; + std::string old_ChannelName; + int movieInfoUpdateAll[MB_INFO_MAX_NUMBER]; int movieInfoUpdateAllIfDestEmptyOnly;