supplement to faad967b97, simplification

Origin commit data
------------------
Branch: ni/coolstream
Commit: 59fa692bd0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-08 (Sat, 08 Dec 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2012-12-08 16:28:53 +01:00
parent faad967b97
commit fa069d793b
3 changed files with 13 additions and 25 deletions

View File

@@ -1955,18 +1955,16 @@ void CNeutrinoApp::numericZap(int msg)
void CNeutrinoApp::showInfo()
{
StopSubtitles();
std::string name = channelList->getActiveChannelName();
std::string pname = "";
char *pname = NULL;
if(g_settings.infobar_show_channeldesc){
CZapitChannel* channel= channelList->getActiveChannel();
CZapitChannel* channel = channelList->getActiveChannel();
if(channel->pname){
pname = channel->pname;
pname=pname.substr(pname.find_first_of("]")+1);
}
}
g_InfoViewer->showTitle(channelList->getActiveChannelNumber(), name, channelList->getActiveSatellitePosition(), channelList->getActiveChannel_ChannelID(), false, 0, pname);
g_InfoViewer->showTitle(channelList->getActiveChannelNumber(), channelList->getActiveChannelName(), channelList->getActiveSatellitePosition(), channelList->getActiveChannel_ChannelID(), false, 0, pname);
StartSubtitles();
}