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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-29 11:41:02 +02:00
parent 9f3e93e083 5b0d909a9f
commit da08c55473
15 changed files with 242 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
@@ -459,7 +468,7 @@ struct SNeutrinoSettings
int recording_fill_warning; //NI
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;