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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/timerdclient/timerdclient.cpp
View File

@@ -28,6 +28,14 @@
#include <timerdclient/timerdmsg.h>
#include <timerdclient/timerdclient.h>
#ifdef PEDANTIC_VALGRIND_SETUP
#define VALGRIND_PARANOIA(x) memset(&x, 0, sizeof(x))
#else
#define VALGRIND_PARANOIA(x) {}
#endif
//int CTimerdClient::adzap_eventID = 0;
unsigned char CTimerdClient::getVersion () const
{
return CTimerdMsg::ACTVERSION;
@@ -43,6 +51,7 @@ const char * CTimerdClient::getSocketName() const
void CTimerdClient::registerEvent(unsigned int eventID, unsigned int clientID, const char * const udsName)
{
CEventServer::commandRegisterEvent msg2;
VALGRIND_PARANOIA(msg2);
msg2.eventID = eventID;
msg2.clientID = clientID;
@@ -58,6 +67,7 @@ void CTimerdClient::registerEvent(unsigned int eventID, unsigned int clientID, c
void CTimerdClient::unRegisterEvent(unsigned int eventID, unsigned int clientID)
{
CEventServer::commandUnRegisterEvent msg2;
VALGRIND_PARANOIA(msg2);
msg2.eventID = eventID;
msg2.clientID = clientID;
@@ -165,6 +175,7 @@ bool CTimerdClient::modifyTimerEvent(int eventid, time_t announcetime, time_t al
// set new time values for event eventid
CTimerdMsg::commandModifyTimer msgModifyTimer;
VALGRIND_PARANOIA(msgModifyTimer);
msgModifyTimer.eventID = eventid;
msgModifyTimer.announceTime = announcetime;
msgModifyTimer.alarmTime = alarmtime;
@@ -203,6 +214,7 @@ bool CTimerdClient::rescheduleTimerEvent(int eventid, time_t diff)
bool CTimerdClient::rescheduleTimerEvent(int eventid, time_t announcediff, time_t alarmdiff, time_t stopdiff)
{
CTimerdMsg::commandModifyTimer msgModifyTimer;
VALGRIND_PARANOIA(msgModifyTimer);
msgModifyTimer.eventID = eventid;
msgModifyTimer.announceTime = announcediff;
msgModifyTimer.alarmTime = alarmdiff;
@@ -298,6 +310,9 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
CTimerd::TransferEventInfo tei;
CTimerd::TransferRecordingInfo tri;
CTimerdMsg::commandAddTimer msgAddTimer;
VALGRIND_PARANOIA(tei);
VALGRIND_PARANOIA(tri);
VALGRIND_PARANOIA(msgAddTimer);
msgAddTimer.alarmTime = alarmtime;
msgAddTimer.announceTime = announcetime;
msgAddTimer.stopTime = stoptime;
@@ -368,6 +383,8 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
void CTimerdClient::removeTimerEvent( int evId)
{
CTimerdMsg::commandRemoveTimer msgRemoveTimer;
VALGRIND_PARANOIA(msgRemoveTimer);
msgRemoveTimer.eventID = evId;
send(CTimerdMsg::CMD_REMOVETIMER, (char*) &msgRemoveTimer, sizeof(msgRemoveTimer));
@@ -436,6 +453,7 @@ bool CTimerdClient::shutdown()
void CTimerdClient::modifyTimerAPid(int eventid, unsigned char apids)
{
CTimerdMsg::commandSetAPid data;
VALGRIND_PARANOIA(data);
data.eventID=eventid;
data.apids = apids;
send(CTimerdMsg::CMD_SETAPID, (char*) &data, sizeof(data));
@@ -446,6 +464,7 @@ void CTimerdClient::modifyTimerAPid(int eventid, unsigned char apids)
void CTimerdClient::setRecordingSafety(int pre, int post)
{
CTimerdMsg::commandRecordingSafety data;
VALGRIND_PARANOIA(data);
data.pre = pre;
data.post = post;
send(CTimerdMsg::CMD_SETRECSAFETY, (char*) &data, sizeof(data));
@@ -518,6 +537,7 @@ void CTimerdClient::setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, std::string
void CTimerdClient::stopTimerEvent( int evId)
{
CTimerdMsg::commandRemoveTimer msgRemoveTimer;
VALGRIND_PARANOIA(msgRemoveTimer);
msgRemoveTimer.eventID = evId;