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

copy fixes from tuxcvs

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


Origin commit data
------------------
Commit: 288f4fd41f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-17 (Wed, 17 Feb 2010)

Origin message was:
------------------
 copy fixes from tuxcvs

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@367 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
Jacek Jendrzej
2010-02-17 21:11:56 +00:00
parent 97f9e685e6
commit 51a3bfe99c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sectionsd/sectionsd.cpp
View File

@@ -783,8 +783,10 @@ static void addEvent(const SIevent &evt, const unsigned table_id, const time_t z
if ((c1->componentType != c2->componentType) || if ((c1->componentType != c2->componentType) ||
(c1->componentTag != c2->componentTag) || (c1->componentTag != c2->componentTag) ||
(c1->streamContent != c2->streamContent) || (c1->streamContent != c2->streamContent) ||
(strcmp(c1->component.c_str(),c2->component.c_str()) != 0)) (strcmp(c1->component.c_str(),c2->component.c_str()) != 0)){
already_exists = false; already_exists = false;
break;
}
c1++; c1++;
c2++; c2++;
} }
@@ -801,8 +803,10 @@ static void addEvent(const SIevent &evt, const unsigned table_id, const time_t z
(si->second->linkage_descs[i].transportStreamId != (si->second->linkage_descs[i].transportStreamId !=
evt.linkage_descs[i].transportStreamId) || evt.linkage_descs[i].transportStreamId) ||
(strcmp(si->second->linkage_descs[i].name.c_str(), (strcmp(si->second->linkage_descs[i].name.c_str(),
evt.linkage_descs[i].name.c_str()) != 0)) evt.linkage_descs[i].name.c_str()) != 0)){
already_exists = false; already_exists = false;
break;
}
} }
} }
@@ -813,8 +817,10 @@ static void addEvent(const SIevent &evt, const unsigned table_id, const time_t z
SIparentalRatings::iterator p2 = evt.ratings.begin(); SIparentalRatings::iterator p2 = evt.ratings.begin();
while ((p1 != si->second->ratings.end()) && (p2 != evt.ratings.end())) { while ((p1 != si->second->ratings.end()) && (p2 != evt.ratings.end())) {
if ((p1->rating != p2->rating) || if ((p1->rating != p2->rating) ||
(strcmp(p1->countryCode.c_str(),p2->countryCode.c_str()) != 0)) (strcmp(p1->countryCode.c_str(),p2->countryCode.c_str()) != 0)){
already_exists = false; already_exists = false;
break;
}
p1++; p1++;
p2++; p2++;
} }
@@ -860,7 +866,10 @@ static void addEvent(const SIevent &evt, const unsigned table_id, const time_t z
} }
SIeventPtr e(eptr); SIeventPtr e(eptr);
// If new extended event descriptor is empty use old one, if applicable
if ((e->getExtendedText().length() == 0) && (si != mySIeventsOrderUniqueKey.end()) &&
(SIlanguage::getMode() == CSectionsdClient::LANGUAGE_MODE_OFF))
e->setExtendedText("OFF",si->second->getExtendedText());
//Strip ExtendedDescription if too far in the future //Strip ExtendedDescription if too far in the future
if ((e->times.begin()->startzeit > zeit + secondsExtendedTextCache) && if ((e->times.begin()->startzeit > zeit + secondsExtendedTextCache) &&
(SIlanguage::getMode() == CSectionsdClient::LANGUAGE_MODE_OFF) && (zeit != 0)) (SIlanguage::getMode() == CSectionsdClient::LANGUAGE_MODE_OFF) && (zeit != 0))