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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 38f17cd88b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)
This commit is contained in:
vanhofen
2016-12-06 20:46:37 +01:00
parent 9086c24617 3fd9316582
commit 73ca7cf0c8
24 changed files with 566 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/timerd/timermanager.cpp
View File

@@ -1176,7 +1176,10 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
eventInfo.epg_starttime = epg_starttime;
eventInfo.channel_id = channel_id;
eventInfo.apids = apids;
eventInfo.autoAdjustToEPG = _autoAdjustToEPG;
eventInfo.recordingSafety = _recordingSafety;
eventInfo.channel_ci = channel_ci; //NI
recordingDir = recDir;
epgTitle="";
autoAdjustToEPG = _autoAdjustToEPG;