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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent ba282cf8c4 7189a98486
commit 2263c8bd2e
106 changed files with 6374 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/system/settings.h
View File

@@ -211,6 +211,11 @@ struct SNeutrinoSettings
int radiotext_enable;
int easymenu;
//screen saver
int screensaver_delay;
std::string screensaver_dir;
int screensaver_timeout;
//vcr
int vcr_AutoSwitch;
@@ -234,6 +239,7 @@ struct SNeutrinoSettings
std::string epg_dir;
int epg_scan;
int epg_scan_mode;
int epg_save_mode;
int epg_search_history_size;
int epg_search_history_max;
@@ -657,7 +663,6 @@ struct SNeutrinoSettings
//audioplayer
int audioplayer_display;
int audioplayer_follow;
int audioplayer_screensaver;
int audioplayer_highprio;
int audioplayer_select_title_by_name;
int audioplayer_repeat_on;