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

zapit/bouquets: format changes

Browse Source 
Origin commit data
------------------
Commit: 2179bc92d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-23 (Thu, 23 Aug 2018)

Origin message was:
------------------
- zapit/bouquets: format changes
This commit is contained in:
vanhofen
2018-08-23 22:29:17 +02:00
parent 3a80a7a7c8
commit 9c03b7fba8
1 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/zapit/src/bouquets.cpp
View File

@@ -888,14 +888,13 @@ void CBouquetManager::loadWebchannels(int mode)
t_channel_id epg_id = 0; t_channel_id epg_id = 0;
if (epgid) if (epgid)
{ {
//NI
if (strcmp(epgid, "auto") == 0 && title) if (strcmp(epgid, "auto") == 0 && title)
{ {
CZapitChannel * channel = CServiceManager::getInstance()->FindChannelByPattern(title); CZapitChannel * channel = CServiceManager::getInstance()->FindChannelByPattern(title);
if (channel && !IS_WEBCHAN(channel->getChannelID())) if (channel && !IS_WEBCHAN(channel->getChannelID()))
{ {
epg_id = channel->getChannelID(); epg_id = channel->getChannelID();
INFO("* auto epg_id found for %s: " PRINTF_CHANNEL_ID_TYPE "", title, epg_id); INFO("* auto epg_id found for %s: " PRINTF_CHANNEL_ID_TYPE "\n", title, epg_id);
} }
} }
else else
@@ -965,8 +964,9 @@ void CBouquetManager::loadWebchannels(int mode)
if (iColon >= 0 && iComma >= 0 && iComma > iColon) if (iColon >= 0 && iComma >= 0 && iComma > iColon)
{ {
iComma++; iComma++;
iColon++;
title = strLine.substr(iComma); title = strLine.substr(iComma);
std::string strInfoLine = strLine.substr(++iColon, --iComma - iColon); std::string strInfoLine = strLine.substr(iColon, --iComma - iColon);
desc = ReadMarkerValue(strInfoLine, TVG_INFO_NAME_MARKER); desc = ReadMarkerValue(strInfoLine, TVG_INFO_NAME_MARKER);
group = ReadMarkerValue(strInfoLine, GROUP_NAME_MARKER); group = ReadMarkerValue(strInfoLine, GROUP_NAME_MARKER);
epgid = ReadMarkerValue(strInfoLine, TVG_INFO_ID_MARKER); epgid = ReadMarkerValue(strInfoLine, TVG_INFO_ID_MARKER);
@@ -979,7 +979,6 @@ void CBouquetManager::loadWebchannels(int mode)
pbouquet->bWebradio = true; pbouquet->bWebradio = true;
} }
else if (strLine[0] != '#') else if (strLine[0] != '#')
{ {
char *url = NULL; char *url = NULL;
@@ -1077,11 +1076,9 @@ void CBouquetManager::loadWebchannels(int mode)
} }
} }
fclose(f); fclose(f);
} }
} }
} }
} }
} }
@@ -1187,7 +1184,8 @@ void CBouquetManager::readEPGMapping()
if(epgmap) if(epgmap)
epgmap = xmlChildrenNode(epgmap); epgmap = xmlChildrenNode(epgmap);
while (epgmap) { while (epgmap)
{
const char *cannelid = xmlGetAttribute(epgmap, "channel_id"); const char *cannelid = xmlGetAttribute(epgmap, "channel_id");
const char *epgid = xmlGetAttribute(epgmap, "new_epg_id"); const char *epgid = xmlGetAttribute(epgmap, "new_epg_id");
t_channel_id epg_id = 0; t_channel_id epg_id = 0;