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/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-20 08:22:22 +02:00
parent 9e20137f68 40ecb9d38c
commit 1eae0a97f3
19 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/timerdclient/timerdclient.cpp
View File

@@ -345,6 +345,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
tri.epg_starttime = ri->epg_starttime;
tri.epgID = ri->epgID;
tri.recordingSafety = ri->recordingSafety;
tri.autoAdjustToEPG = ri->autoAdjustToEPG;
tri.channel_ci = ri->channel_ci; //NI
strncpy(tri.recordingDir, ri->recordingDir, RECORD_DIR_MAXLEN-1);
length = sizeof( CTimerd::TransferRecordingInfo);