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

CBouquetManager/sectionsd: get rid of (char *) casts left over from rev 117

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1552 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: f0f2c77166
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-06-19 (Sun, 19 Jun 2011)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2011-06-19 20:26:21 +00:00
parent 4c269b6179
commit 9ab19539e4
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sectionsd/sectionsd.cpp
View File

@@ -1396,7 +1396,7 @@ static void removeWasteEvents()
while (xmlGetNextOccurence(node, "channel") != NULL) { while (xmlGetNextOccurence(node, "channel") != NULL) {
// printf("here5\n"); // printf("here5\n");
if (e->second->service_id != xmlGetNumericAttribute(node, if (e->second->service_id != xmlGetNumericAttribute(node,
(char*)"service_id", 16)) "service_id", 16))
node = node->xmlNextNode; node = node->xmlNextNode;
else break; else break;
} }

2
src/zapit/include/zapit/bouquets.h
View File

@@ -61,7 +61,7 @@ class CBouquetManager
CZapitBouquet * remainChannels; CZapitBouquet * remainChannels;
void makeRemainingChannelsBouquet(void); void makeRemainingChannelsBouquet(void);
void parseBouquetsXml (char * fname, bool ub = false); void parseBouquetsXml (const char * fname, bool ub = false);
void writeBouquetHeader (FILE * bouq_fd, uint32_t i, const char * bouquetName); void writeBouquetHeader (FILE * bouq_fd, uint32_t i, const char * bouquetName);
void writeBouquetFooter (FILE * bouq_fd); void writeBouquetFooter (FILE * bouq_fd);
void writeBouquetChannels (FILE * bouq_fd, uint32_t i, bool bUser = false); void writeBouquetChannels (FILE * bouq_fd, uint32_t i, bool bUser = false);

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

@@ -353,7 +353,7 @@ void CBouquetManager::sortBouquets(void)
sort(Bouquets.begin(), Bouquets.end(), CmpBouquetByChName()); sort(Bouquets.begin(), Bouquets.end(), CmpBouquetByChName());
} }
void CBouquetManager::parseBouquetsXml(char * fname, bool bUser) void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
{ {
xmlDocPtr parser; xmlDocPtr parser;
@@ -387,12 +387,12 @@ void CBouquetManager::parseBouquetsXml(char * fname, bool bUser)
newBouquet->bFav = (strcmp(name, "favorites") == 0); newBouquet->bFav = (strcmp(name, "favorites") == 0);
channel_node = search->xmlChildrenNode; channel_node = search->xmlChildrenNode;
while ((channel_node = xmlGetNextOccurence(channel_node, "S")) != NULL) { while ((channel_node = xmlGetNextOccurence(channel_node, "S")) != NULL) {
std::string name2 = xmlGetAttribute(channel_node, (char *) "n"); std::string name2 = xmlGetAttribute(channel_node, "n");
GET_ATTR(channel_node, (char *) "i", SCANF_SERVICE_ID_TYPE, service_id); GET_ATTR(channel_node, "i", SCANF_SERVICE_ID_TYPE, service_id);
GET_ATTR(channel_node, (char *) "on", SCANF_ORIGINAL_NETWORK_ID_TYPE, original_network_id); GET_ATTR(channel_node, "on", SCANF_ORIGINAL_NETWORK_ID_TYPE, original_network_id);
GET_ATTR(channel_node, (char *) "s", SCANF_SATELLITE_POSITION_TYPE, satellitePosition); GET_ATTR(channel_node, "s", SCANF_SATELLITE_POSITION_TYPE, satellitePosition);
GET_ATTR(channel_node, (char *) "t", SCANF_TRANSPORT_STREAM_ID_TYPE, transport_stream_id); GET_ATTR(channel_node, "t", SCANF_TRANSPORT_STREAM_ID_TYPE, transport_stream_id);
GET_ATTR(channel_node, (char *) "frq", SCANF_SATELLITE_POSITION_TYPE, freq); GET_ATTR(channel_node, "frq", SCANF_SATELLITE_POSITION_TYPE, freq);
if(freq > 20000) freq = freq/1000; if(freq > 20000) freq = freq/1000;
CZapitChannel* chan; CZapitChannel* chan;
@@ -428,11 +428,11 @@ void CBouquetManager::loadBouquets(bool ignoreBouquetFile)
{ {
TIMER_START(); TIMER_START();
if (ignoreBouquetFile == false) { if (ignoreBouquetFile == false) {
parseBouquetsXml((char *) BOUQUETS_XML, false); parseBouquetsXml(BOUQUETS_XML, false);
sortBouquets(); sortBouquets();
} }
parseBouquetsXml((char *) UBOUQUETS_XML, true); parseBouquetsXml(UBOUQUETS_XML, true);
renumServices(); renumServices();
TIMER_STOP("[zapit] bouquet loading took"); TIMER_STOP("[zapit] bouquet loading took");
} }