mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd:fix some compil warnings

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-01-30 17:33:50 +01:00
parent 5059248d39
commit b1899de3f5
5 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/eitd/SIevents.hpp
View File

@@ -107,18 +107,20 @@ public:
t_original_network_id originalNetworkId;
t_service_id serviceId;
SIlinkage(void) {
SIlinkage(void):
transportStreamId(0),
originalNetworkId(0),
serviceId(0)
{
linkageType = 0;
transportStreamId = 0;
originalNetworkId = 0;
serviceId = 0;
}
SIlinkage(const struct descr_linkage_header *link) {
SIlinkage(const struct descr_linkage_header *link):
transportStreamId((link->transport_stream_id_hi << 8) | link->transport_stream_id_lo),
originalNetworkId((link->original_network_id_hi << 8) | link->original_network_id_lo),
serviceId((link->service_id_hi << 8) | link->service_id_lo)
{
linkageType = link->linkage_type;
transportStreamId = (link->transport_stream_id_hi << 8) | link->transport_stream_id_lo;
originalNetworkId = (link->original_network_id_hi << 8) | link->original_network_id_lo;
serviceId = (link->service_id_hi << 8) | link->service_id_lo;
if (link->descriptor_length > sizeof(struct descr_linkage_header) - 2)
name = convertDVBUTF8(((const char *)link)+sizeof(struct descr_linkage_header), link->descriptor_length-(sizeof(struct descr_linkage_header)-2), 0, 0);
}
@@ -296,8 +298,9 @@ class SItime {
time_t startzeit; // lokale Zeit, 0 -> time shifted (cinedoms)
unsigned dauer; // in Sekunden, 0 -> time shifted (cinedoms)
SItime(time_t s, unsigned d) {
startzeit=s;
SItime(time_t s, unsigned d):
startzeit(s)
{
dauer=d; // in Sekunden, 0 -> time shifted (cinedoms)
}
@@ -502,10 +505,11 @@ class SIevent
SIeventClassifications classifications;
SIevent(const t_original_network_id, const t_transport_stream_id, const t_service_id, const unsigned short);
SIevent(void) {
service_id = 0;
original_network_id = 0;
transport_stream_id = 0;
SIevent(void):
service_id(0),
original_network_id(0),
transport_stream_id(0)
{
eventID = 0;
//vps = 0;
table_id = 0xFF; /* 0xFF means "not set" */

16
src/eitd/SIservices.hpp
View File

@@ -40,11 +40,11 @@ public:
t_original_network_id original_network_id;
t_transport_stream_id transport_stream_id;
SInvodReference(const t_transport_stream_id new_transport_stream_id, const t_original_network_id new_original_network_id, const t_service_id new_service_id)
SInvodReference(const t_transport_stream_id new_transport_stream_id, const t_original_network_id new_original_network_id, const t_service_id new_service_id):
service_id(new_service_id),
original_network_id(new_original_network_id),
transport_stream_id(new_transport_stream_id)
{
service_id = new_service_id;
original_network_id = new_original_network_id;
transport_stream_id = new_transport_stream_id;
}
bool operator < (const SInvodReference& ref) const
@@ -106,11 +106,11 @@ public:
std::string providerName; // Name aus dem Service-Descriptor
#endif
SIservice(const t_service_id _service_id, const t_original_network_id _original_network_id, const t_transport_stream_id _transport_stream_id)
SIservice(const t_service_id _service_id, const t_original_network_id _original_network_id, const t_transport_stream_id _transport_stream_id):
service_id(_service_id),
original_network_id(_original_network_id),
transport_stream_id(_transport_stream_id)
{
service_id = _service_id;
original_network_id = _original_network_id;
transport_stream_id = _transport_stream_id;
serviceTyp=0;
memset(&flags, 0, sizeof(flags));
is_actual = 0;

10
src/eitd/eitd.h
View File

@@ -65,7 +65,7 @@ typedef SIservice * SIservicePtr;
struct OrderServiceUniqueKeyFirstStartTimeEventUniqueKey
{
bool operator()(const SIeventPtr &p1, const SIeventPtr &p2)
bool operator()(const SIeventPtr &p1, const SIeventPtr &p2) const
{
return
(p1->get_channel_id() == p2->get_channel_id()) ?
@@ -77,7 +77,7 @@ struct OrderServiceUniqueKeyFirstStartTimeEventUniqueKey
struct OrderFirstEndTimeServiceIDEventUniqueKey
{
bool operator()(const SIeventPtr &p1, const SIeventPtr &p2)
bool operator()(const SIeventPtr &p1, const SIeventPtr &p2) const
{
return
p1->times.begin()->startzeit + (long)p1->times.begin()->dauer == p2->times.begin()->startzeit + (long)p2->times.begin()->dauer ?
@@ -149,7 +149,7 @@ class CSectionThread : public OpenThreads::Thread, public DMX
/* main thread function */
void run();
public:
CSectionThread(std::string tname, unsigned short pid)
CSectionThread(const std::string &tname, unsigned short pid)
{
name = tname;
pID = pid;
@@ -214,7 +214,7 @@ class CEventsThread : public CSectionThread
/* EIT-specific */
bool addEvents();
public:
CEventsThread(std::string tname, unsigned short pid = 0x12)
CEventsThread(const std::string &tname, unsigned short pid = 0x12)
: CSectionThread(tname, pid)
{
};
@@ -228,7 +228,7 @@ class CEitThread : public CEventsThread
void beforeSleep();
public:
CEitThread();
CEitThread(std::string tname, unsigned short pid = 0x12);
CEitThread(const std::string &tname, unsigned short pid = 0x12);
};
class CFreeSatThread : public CEventsThread

7
src/eitd/sectionsd.cpp
View File

@@ -1445,12 +1445,11 @@ bool CTimeThread::setSystemTime(time_t tim, bool force)
tv.tv_sec = tim;
tv.tv_usec = 0;
errno=0;
if (settimeofday(&tv, NULL) == 0)
return true;
perror("[sectionsd] settimeofday");
return errno==EPERM;
return true;
}
void CTimeThread::addFilters()
@@ -1816,7 +1815,7 @@ CEitThread::CEitThread()
{
}
CEitThread::CEitThread(std::string tname, unsigned short pid)
CEitThread::CEitThread(const std::string &tname, unsigned short pid)
: CEventsThread(tname, pid)
{
}
@@ -1855,7 +1854,7 @@ void CEitThread::beforeSleep()
sizeof(messaging_current_servicekey));
}
if(notify_complete)
system(CONFIGDIR "/epgdone.sh");
int ignored __attribute__((unused)) = system(CONFIGDIR "/epgdone.sh");
}
/********************************************************************************/

3
src/eitd/xmlutil.cpp
View File

@@ -649,7 +649,8 @@ void *insertEventsfromXMLTV(void * data)
reader_ready = true;
pthread_exit(NULL);
}
std::string url = (char *) data;
static std::string url = "";
url = (std::string)(char *) data;
std::string tmp_name = randomFile(getFileExt(url), "/tmp", 8);
int64_t now = time_monotonic_ms();