From f26b51198771f136fc1b9901cc4d333a766ee723 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 2 Jun 2015 15:17:00 +0300 Subject: [PATCH] gui/movieplayer.cpp, neutrino.cpp: call infoviewer with channel as param Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4322f2465111174a3ab558993f6c64fd049dd5a0 Author: [CST] Focus Date: 2015-06-02 (Tue, 02 Jun 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 5 +---- src/neutrino.cpp | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 8d7925b88..96346261e 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1189,10 +1189,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore) void CMoviePlayerGui::callInfoViewer() { if (timeshift != TSHIFT_MODE_OFF) { - g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), - CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), - CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), - CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); + g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannel()); return; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 883805331..3da99f479 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2140,16 +2140,7 @@ void CNeutrinoApp::numericZap(int msg) void CNeutrinoApp::showInfo() { StopSubtitles(); - - char *pname = NULL; - if(g_settings.infobar_show_channeldesc){ - CZapitChannel* channel = channelList->getActiveChannel(); - if(channel->pname){ - pname = channel->pname; - } - } - - g_InfoViewer->showTitle(channelList->getActiveChannelNumber(), channelList->getActiveChannelName(), channelList->getActiveSatellitePosition(), channelList->getActiveChannel_ChannelID(), false, 0, pname); + g_InfoViewer->showTitle(channelList->getActiveChannel()); StartSubtitles(); }