mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -1085,7 +1085,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();
}

2
src/nhttpd/tuxboxapi/neutrinoapi.cpp
View File

@@ -515,7 +515,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";
}
}

2
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -597,7 +597,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;