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

eitd: add operators, simplify event compare code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 358cba5227
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-10 (Fri, 10 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-02-10 18:01:22 +04:00
parent 4652eb056d
commit 0098439c06
2 changed files with 62 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/eitd/SIevents.hpp
View File

@@ -49,10 +49,6 @@ public:
serviceId = 0;
}
// Der Operator zum sortieren
bool operator < (const SIlinkage& l) const {
return name < l.name;
}
void dump(void) const {
printf("Linakge Type: 0x%02hhx\n", linkageType);
@@ -71,8 +67,26 @@ public:
// return 1;
return 0;
}
// Der Operator zum sortieren
bool operator < (const SIlinkage& l) const {
return name < l.name;
}
bool operator==(const SIlinkage& s) const {
return (linkageType == s.linkageType) &&
(transportStreamId == s.transportStreamId) &&
(originalNetworkId == s.originalNetworkId) &&
(serviceId == s.serviceId) &&
(name == s.name);
}
bool operator!=(const SIlinkage& s) const {
return (linkageType != s.linkageType) ||
(transportStreamId != s.transportStreamId) ||
(originalNetworkId != s.originalNetworkId) ||
(serviceId != s.serviceId) ||
(name != s.name);
}
};
typedef std::vector<class SIlinkage> SIlinkage_descs;
// Fuer for_each
struct printSIlinkage : public std::unary_function<class SIlinkage, void>
@@ -88,8 +102,6 @@ struct saveSIlinkageXML : public std::unary_function<class SIlinkage, void>
void operator() (const SIlinkage &l) { l.saveXML(f);}
};
typedef std::vector<class SIlinkage> SIlinkage_descs;
class SIcomponent
{
public:
@@ -103,10 +115,6 @@ class SIcomponent
componentType=0;
componentTag=0;
}
// Der Operator zum sortieren
bool operator < (const SIcomponent& c) const {
return streamContent < c.streamContent;
}
void dump(void) const {
if(component.length())
printf("Component: %s\n", component.c_str());
@@ -120,6 +128,22 @@ class SIcomponent
fprintf(file, "\"/>\n");
return 0;
}
// Der Operator zum sortieren
bool operator < (const SIcomponent& c) const {
return streamContent < c.streamContent;
}
bool operator==(const SIcomponent& c) const {
return (componentType == c.componentType) &&
(componentTag == c.componentTag) &&
(streamContent == c.streamContent) &&
(component == c.component);
}
bool operator!=(const SIcomponent& c) const {
return (componentType != c.componentType) ||
(componentTag != c.componentTag) ||
(streamContent != c.streamContent) ||
(component != c.component);
}
};
typedef std::multiset <SIcomponent, std::less<SIcomponent> > SIcomponents;
@@ -161,7 +185,16 @@ class SIparentalRating
return 1;
return 0;
}
bool operator==(const SIparentalRating& p) const {
return (rating == p.rating) &&
(countryCode == p.countryCode);
}
bool operator!=(const SIparentalRating& p) const {
return (rating != p.rating) ||
(countryCode != p.countryCode);
}
};
typedef std::set <SIparentalRating, std::less<SIparentalRating> > SIparentalRatings;
// Fuer for_each
struct printSIparentalRating : public std::unary_function<SIparentalRating, void>
@@ -177,8 +210,6 @@ struct saveSIparentalRatingXML : public std::unary_function<SIparentalRating, vo
void operator() (const SIparentalRating &r) { r.saveXML(f);}
};
typedef std::set <SIparentalRating, std::less<SIparentalRating> > SIparentalRatings;
class SItime {
public:
time_t startzeit; // lokale Zeit, 0 -> time shifted (cinedoms)
@@ -201,6 +232,14 @@ class SItime {
fprintf(file, "\t\t\t<time start_time=\"%u\" duration=\"%u\"/>\n", (unsigned int) startzeit, dauer);
return 0;
}
bool operator==(const SItime& t) const {
return (dauer == t.dauer) &&
(startzeit == t.startzeit);
}
bool operator!=(const SItime& t) const {
return (dauer != t.dauer) ||
(startzeit != t.startzeit);
}
};
typedef std::set <SItime, std::less<SItime> > SItimes;