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

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

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-21 11:30:48 +02:00
parent 6542629122 108cf42786
commit d35d014a76
16 changed files with 581 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/timerdclient/timerdtypes.h
View File

@@ -68,7 +68,8 @@ class CTimerd
TIMER_REMIND,
TIMER_SLEEPTIMER,
TIMER_EXEC_PLUGIN,
TIMER_IMMEDIATE_RECORD
TIMER_IMMEDIATE_RECORD,
TIMER_REMOTEBOX
};
enum CTimerEventStates
@@ -165,6 +166,9 @@ class CTimerd
char pluginName[EXEC_PLUGIN_NAME_MAXLEN]; //only filled if applicable
char recordingDir[RECORD_DIR_MAXLEN]; //only filled if applicable
char epgTitle[EPG_TITLE_MAXLEN]; //only filled if applicable
char remotebox_ip[16];
int rem_pre;
int rem_post;
bool channel_ci; //NI
bool operator< (const responseGetTimer& a) const