mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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);

4
lib/timerdclient/timerdclient.h
View File

@@ -111,7 +111,7 @@ class CTimerdClient:private CBasicClient
// adds new record timer event
int addRecordTimerEvent(const t_channel_id channel_id, time_t alarmtime, time_t stoptime,
uint64_t epgID=0, time_t epg_starttime=0, time_t announcetime = 0,
unsigned char apids=TIMERD_APIDS_STD, bool safety=false,std::string recDir="", bool forceAdd=true, bool channel_ci=false) //NI
unsigned char apids=TIMERD_APIDS_STD, bool safety=false,bool autoAdjust=false, std::string recDir="", bool forceAdd=true, bool channel_ci=false) //NI
{
CTimerd::RecordingInfo eventInfo;
eventInfo.channel_id = channel_id;
@@ -119,6 +119,7 @@ class CTimerdClient:private CBasicClient
eventInfo.epg_starttime = epg_starttime;
eventInfo.apids = apids;
eventInfo.recordingSafety = safety;
eventInfo.autoAdjustToEPG = autoAdjust;
eventInfo.channel_ci = channel_ci; //NI
strncpy(eventInfo.recordingDir, recDir.c_str(), RECORD_DIR_MAXLEN);
return addTimerEvent(CTimerd::TIMER_RECORD, &eventInfo, announcetime, alarmtime, stoptime,CTimerd::TIMERREPEAT_ONCE, 0,forceAdd);
@@ -133,6 +134,7 @@ class CTimerdClient:private CBasicClient
eventInfo.epg_starttime = epg_starttime;
eventInfo.apids = apids;
eventInfo.recordingSafety = false;
eventInfo.autoAdjustToEPG = false;
return addTimerEvent(CTimerd::TIMER_IMMEDIATE_RECORD, &eventInfo, 0, alarmtime, stoptime);
};

4
lib/timerdclient/timerdtypes.h
View File

@@ -87,6 +87,7 @@ class CTimerd
t_channel_id channel_id;
unsigned char apids;
bool recordingSafety;
bool autoAdjustToEPG;
bool channel_ci; //NI - channel is member of CI bouquet?
};
@@ -97,6 +98,7 @@ class CTimerd
t_channel_id channel_id;
unsigned char apids;
bool recordingSafety;
bool autoAdjustToEPG;
bool channel_ci; //NI - channel is member of CI bouquet?
};
@@ -118,6 +120,7 @@ class CTimerd
epgID = e.epgID;
epg_starttime = e.epg_starttime;
recordingSafety = e.recordingSafety;
autoAdjustToEPG = e.autoAdjustToEPG;
channel_ci = e.channel_ci; //NI
};
RecordingInfo& operator = (EventInfo& e)
@@ -127,6 +130,7 @@ class CTimerd
epgID = e.epgID;
epg_starttime = e.epg_starttime;
recordingSafety = e.recordingSafety;
autoAdjustToEPG = e.autoAdjustToEPG;
channel_ci = e.channel_ci; //NI
return *this;
}