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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
This commit is contained in:
vanhofen
2016-10-21 11:23:51 +02:00
parent 9a97934534 1c976d8579
commit 2510d548e0
15 changed files with 577 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