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

Merge branch 'check/next-cc'

Browse Source 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-06-16 21:22:14 +02:00
parent 0b7367ec22 7969ca5696
commit 4c3c21152b
160 changed files with 6251 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/sectionsdclient/sectionsdMsg.h
View File

@@ -81,6 +81,7 @@ struct sectionsd
{
t_channel_id channel_id;
bool requestEvent;
int dnum;
};
struct responseIsTimeSet

3
lib/sectionsdclient/sectionsdclient.cpp
View File

@@ -155,13 +155,14 @@ bool CSectionsdClient::getIsScanningActive()
}
}
void CSectionsdClient::setServiceChanged(const t_channel_id channel_id, const bool requestEvent)
void CSectionsdClient::setServiceChanged(const t_channel_id channel_id, const bool requestEvent, int dnum)
{
sectionsd::commandSetServiceChanged msg;
VALGRIND_PARANOIA(msg);
msg.channel_id = channel_id;
msg.requestEvent = requestEvent;
msg.dnum = dnum;
send(sectionsd::serviceChanged, (char *)&msg, sizeof(msg));

3
lib/sectionsdclient/sectionsdclient.h
View File

@@ -79,6 +79,7 @@ class CSectionsdClient : private CBasicClient
{
EVT_TIMESET,
EVT_GOT_CN_EPG,
EVT_EIT_COMPLETE,
#if 0
EVT_SERVICES_UPDATE,
EVT_BOUQUETS_UPDATE,
@@ -189,7 +190,7 @@ class CSectionsdClient : private CBasicClient
bool getIsTimeSet();
void setPauseScanning(const bool doPause);
void setServiceChanged(const t_channel_id channel_id, const bool requestEvent);
void setServiceChanged(const t_channel_id channel_id, const bool requestEvent, int dnum = 0);
bool getIsScanningActive();