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

screensaver: remove audioplayer_screensaver; add screensaver_delay

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: df18f1f4e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: remove audioplayer_screensaver; add screensaver_delay

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-12-29 21:53:50 +01:00
parent c36805b321
commit 4aad5781c9
9 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -497,6 +497,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 0 );
//screen saver
g_settings.screensaver_delay = configfile.getInt32("screensaver_delay", 1);
g_settings.screensaver_dir = configfile.getString("screensaver_dir", DATADIR "/neutrino/icons/");
g_settings.screensaver_timeout = configfile.getInt32("screensaver_timeout", 10);
@@ -778,7 +779,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
//Audio-Player
g_settings.audioplayer_display = configfile.getInt32("audioplayer_display",(int)CAudioPlayerGui::ARTIST_TITLE);
g_settings.audioplayer_follow = configfile.getInt32("audioplayer_follow",0);
g_settings.audioplayer_screensaver = configfile.getInt32("audioplayer_screensaver", 1);
g_settings.audioplayer_highprio = configfile.getInt32("audioplayer_highprio",0);
g_settings.audioplayer_select_title_by_name = configfile.getInt32("audioplayer_select_title_by_name",0);
g_settings.audioplayer_repeat_on = configfile.getInt32("audioplayer_repeat_on",0);
@@ -1025,6 +1025,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString("subs_charset", g_settings.subs_charset);
//screen saver
configfile.setInt32("screensaver_delay", g_settings.screensaver_delay);
configfile.setString("screensaver_dir", g_settings.screensaver_dir);
configfile.setInt32("screensaver_timeout", g_settings.screensaver_timeout);
@@ -1238,7 +1239,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
//Audio-Player
configfile.setInt32( "audioplayer_display", g_settings.audioplayer_display );
configfile.setInt32( "audioplayer_follow", g_settings.audioplayer_follow );
configfile.setInt32( "audioplayer_screensaver", g_settings.audioplayer_screensaver );
configfile.setInt32( "audioplayer_highprio", g_settings.audioplayer_highprio );
configfile.setInt32( "audioplayer_select_title_by_name", g_settings.audioplayer_select_title_by_name );
configfile.setInt32( "audioplayer_repeat_on", g_settings.audioplayer_repeat_on );