mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source
This commit is contained in:
Thilo Graf
2016-10-29 12:38:17 +02:00
parent fa9e34fcca e5402057d3
commit aae4411d03
14 changed files with 240 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/locals.h
View File

@@ -2128,8 +2128,12 @@ typedef enum
LOCALE_REMOTEBOX_CHANNEL_NA,
LOCALE_REMOTEBOX_DEL,
LOCALE_REMOTEBOX_HEAD,
LOCALE_REMOTEBOX_IP,
LOCALE_REMOTEBOX_MOD,
LOCALE_REMOTEBOX_PASS,
LOCALE_REMOTEBOX_PORT,
LOCALE_REMOTEBOX_RBADDR,
LOCALE_REMOTEBOX_RBNAME,
LOCALE_REMOTEBOX_USER,
LOCALE_RESET_ALL,
LOCALE_RESET_CHANNELS,
LOCALE_RESET_CONFIRM,

6
src/system/locals_intern.h
View File

@@ -2128,8 +2128,12 @@ const char * locale_real_names[] =
"remotebox_channel_na",
"remotebox_del",
"remotebox_head",
"remotebox_ip",
"remotebox_mod",
"remotebox_pass",
"remotebox_port",
"remotebox_rbaddr",
"remotebox_rbname",
"remotebox_user",
"reset_all",
"reset_channels",
"reset_confirm",

11
src/system/settings.h
View File

@@ -145,6 +145,15 @@ struct SNeutrinoTheme
unsigned char clock_Digit_blue;
};
struct timer_remotebox_item
{
unsigned int port;
std::string user;
std::string pass;
std::string rbname;
std::string rbaddress;
};
struct SNeutrinoSettings
{
std::string version_pseudo;
@@ -450,7 +459,7 @@ struct SNeutrinoSettings
int recording_slow_warning;
int recording_startstop_msg;
int shutdown_timer_record_type;
std::list<std::string> timer_remotebox_ip;
std::vector<timer_remotebox_item> timer_remotebox_ip;
std::string recording_filename_template;
int recording_already_found_check;