mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
configure.ac
data/icons/buttons/0.png
data/icons/buttons/1.png
data/icons/buttons/2.png
data/icons/buttons/3.png
data/icons/buttons/4.png
data/icons/buttons/5.png
data/icons/buttons/6.png
data/icons/buttons/7.png
data/icons/buttons/8.png
data/icons/buttons/9.png
data/icons/buttons/blau.png
data/icons/buttons/btn_backward.png
data/icons/buttons/btn_forward.png
data/icons/buttons/btn_pause.png
data/icons/buttons/btn_play.png
data/icons/buttons/btn_record_active.png
data/icons/buttons/btn_record_inactive.png
data/icons/buttons/btn_stop.png
data/icons/buttons/down.png
data/icons/buttons/gelb.png
data/icons/buttons/gruen.png
data/icons/buttons/help.png
data/icons/buttons/help_small.png
data/icons/buttons/home.png
data/icons/buttons/info.png
data/icons/buttons/info_small.png
data/icons/buttons/left.png
data/icons/buttons/menu.png
data/icons/buttons/menu_small.png
data/icons/buttons/mute_small.png
data/icons/buttons/mute_zap_gray.png
data/icons/buttons/mute_zap_green.png
data/icons/buttons/ok.png
data/icons/buttons/power.png
data/icons/buttons/right.png
data/icons/buttons/rot.png
data/icons/buttons/up.png
data/icons/filetypes/movie.png
data/icons/filetypes/mp3.png
data/icons/headers/audio.png
data/icons/headers/bookmarkmanager.png
data/icons/headers/colors.png
data/icons/headers/error.png
data/icons/headers/features.png
data/icons/headers/games.png
data/icons/headers/icon_blue.png
data/icons/headers/icon_green.png
data/icons/headers/icon_red.png
data/icons/headers/icon_yellow.png
data/icons/headers/information.png
data/icons/headers/keybinding.png
data/icons/headers/language.png
data/icons/headers/lcd.png
data/icons/headers/mainmenue.png
data/icons/headers/multimedia.png
data/icons/headers/network.png
data/icons/headers/personalize.png
data/icons/headers/shell.png
data/icons/headers/softupdate.png
data/icons/headers/streaming.png
data/icons/headers/timer.png
data/icons/headers/upnp.png
data/icons/headers/video.png
data/icons/movieplayer/mp_b-skip.png
data/icons/movieplayer/mp_f-skip.png
data/icons/movieplayer/mp_pause.png
data/icons/movieplayer/mp_play.png
data/icons/movieplayer/mp_play_repeat_all.png
data/icons/movieplayer/mp_play_repeat_track.png
data/icons/status/ca/biss_green.png
data/icons/status/ca/biss_white.png
data/icons/status/ca/biss_yellow.png
data/icons/status/ca/conax_green.png
data/icons/status/ca/conax_white.png
data/icons/status/ca/conax_yellow.png
data/icons/status/ca/cw_green.png
data/icons/status/ca/cw_white.png
data/icons/status/ca/cw_yellow.png
data/icons/status/ca/d_green.png
data/icons/status/ca/d_white.png
data/icons/status/ca/d_yellow.png
data/icons/status/ca/ird_green.png
data/icons/status/ca/ird_white.png
data/icons/status/ca/ird_yellow.png
data/icons/status/ca/nagra_green.png
data/icons/status/ca/nagra_white.png
data/icons/status/ca/nagra_yellow.png
data/icons/status/ca/nds_green.png
data/icons/status/ca/nds_white.png
data/icons/status/ca/nds_yellow.png
data/icons/status/ca/powervu_green.png
data/icons/status/ca/powervu_white.png
data/icons/status/ca/powervu_yellow.png
data/icons/status/ca/seca_green.png
data/icons/status/ca/seca_white.png
data/icons/status/ca/seca_yellow.png
data/icons/status/ca/via_green.png
data/icons/status/ca/via_white.png
data/icons/status/ca/via_yellow.png
data/icons/status/ca/x_green.png
data/icons/status/ca/x_white.png
data/icons/status/ca/x_yellow.png
data/icons/status/channel/16_9.png
data/icons/status/channel/16_9_gray.png
data/icons/status/channel/ca2.png
data/icons/status/channel/ca2_gray.png
data/icons/status/channel/dd.png
data/icons/status/channel/dd_avail.png
data/icons/status/channel/dd_gray.png
data/icons/status/channel/radiotextget.png
data/icons/status/channel/radiotextoff.png
data/icons/status/channel/radiotextwait.png
data/icons/status/channel/res_000.png
data/icons/status/channel/res_1080.png
data/icons/status/channel/res_1280.png
data/icons/status/channel/res_1440.png
data/icons/status/channel/res_1920.png
data/icons/status/channel/res_288.png
data/icons/status/channel/res_352.png
data/icons/status/channel/res_382.png
data/icons/status/channel/res_480.png
data/icons/status/channel/res_528.png
data/icons/status/channel/res_544.png
data/icons/status/channel/res_576.png
data/icons/status/channel/res_704.png
data/icons/status/channel/res_720.png
data/icons/status/channel/res_hd.png
data/icons/status/channel/res_sd.png
data/icons/status/channel/subt.png
data/icons/status/channel/subt_gray.png
data/icons/status/channel/tuner_1.png
data/icons/status/channel/tuner_2.png
data/icons/status/channel/tuner_3.png
data/icons/status/channel/tuner_4.png
data/icons/status/channel/vtxt.png
data/icons/status/channel/vtxt_gray.png
data/icons/status/various/ats.png
data/icons/status/various/ats_gray.png
data/icons/status/various/ca.png
data/icons/status/various/lock.png
data/icons/status/various/mounted.png
data/icons/status/various/mute.png
data/icons/status/various/not_mounted.png
data/icons/status/various/pip.png
data/icons/status/various/rec_event_marker.png
data/icons/status/various/rec_gray.png
data/icons/status/various/zap.png
data/locale/Makefile.am
data/locale/english.locale
data/pictures/backgrounds/1280x720/start.jpg
src/driver/fb_accel_sti.cpp
src/gui/Makefile.am
src/gui/dboxinfo.cpp
src/gui/infoviewer_bb.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/system/settings.cpp
src/system/settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
@@ -28,6 +28,12 @@
|
||||
#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
|
||||
|
||||
unsigned char CTimerdClient::getVersion () const
|
||||
{
|
||||
return CTimerdMsg::ACTVERSION;
|
||||
@@ -43,6 +49,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 +65,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 +173,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 +212,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 +308,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;
|
||||
@@ -369,6 +382,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));
|
||||
@@ -437,6 +452,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));
|
||||
@@ -447,6 +463,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));
|
||||
@@ -519,6 +536,7 @@ void CTimerdClient::setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, std::string
|
||||
void CTimerdClient::stopTimerEvent( int evId)
|
||||
{
|
||||
CTimerdMsg::commandRemoveTimer msgRemoveTimer;
|
||||
VALGRIND_PARANOIA(msgRemoveTimer);
|
||||
|
||||
msgRemoveTimer.eventID = evId;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user