mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +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: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-02 09:50:10 +01:00
parent abfb65680e c21cc27381
commit 6dfe9dc9ba
50 changed files with 5794 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/system/settings.h
View File

@@ -149,6 +149,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;
@@ -461,9 +470,10 @@ struct SNeutrinoSettings
int recording_zap_on_announce;
int recording_slow_warning;
int recording_fill_warning; //NI
int recording_tevents; //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;