Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
38 changed files with 68 additions and 68 deletions

View File

@@ -1074,7 +1074,7 @@ void CControlAPI::LogolistCGI(CyhookHandler *hh)
if (g_PicViewer->GetLogoName(channel->getChannelID(), NeutrinoAPI->GetServiceName(channel->getChannelID()), logo_used, NULL, NULL))
{
realpath(logo_used.c_str(), _real);
logo_real = string(_real);
logo_real = std::string(_real);
if (strcmp(logo_used.c_str(), logo_real.c_str()) == 0)
logo_real.clear();
}

View File

@@ -514,7 +514,7 @@ std::string CNeutrinoAPI::getCryptInfoAsString(void)
for(casys_map_iterator_t it = channel->camap.begin(); it != channel->camap.end(); ++it) {
int caid = (*it) & 0xFF00;
if(caid == caids[i])
out << casys[i] << hex << (*it) << "\n";
out << casys[i] << std::hex << (*it) << "\n";
}
}

View File

@@ -585,7 +585,7 @@ std::string CNeutrinoYParser::func_get_logo_name(CyhookHandler *hh, std::string
std::string fileType[] = { ".png", ".jpg" , ".gif" };
std::string channelIdShort = channelId.substr(channelId.length() - 12);
channelIdShort = channelIdShort.erase(0, min(channelIdShort.find_first_not_of('0'), channelIdShort.size()-1));
channelIdShort = channelIdShort.erase(0, std::min(channelIdShort.find_first_not_of('0'), channelIdShort.size()-1));
std::string channelName = "";
t_channel_id chId = 0;