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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-06-02 21:42:10 +02:00
parent d9980f2d87 8e429f9e6a
commit cec7e5b8bb
12 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -687,6 +687,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.recording_slow_warning = configfile.getBool("recording_slow_warning" , false); //NI
g_settings.recording_fill_warning = configfile.getInt32("recording_fill_warning", 95); //NI
g_settings.recording_startstop_msg = configfile.getBool("recording_startstop_msg" , true);
g_settings.recording_already_found_check = configfile.getBool("recording_already_found_check", false);
// default plugin for movieplayer
g_settings.movieplayer_plugin = configfile.getString( "movieplayer_plugin", "---" );
@@ -1249,6 +1250,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool ("recording_slow_warning" , g_settings.recording_slow_warning );
configfile.setInt32 ("recording_fill_warning" , g_settings.recording_fill_warning ); //NI
configfile.setBool ("recording_startstop_msg" , g_settings.recording_startstop_msg );
configfile.setBool ("recording_already_found_check" , g_settings.recording_already_found_check );
// default plugin for movieplayer
configfile.setString ( "movieplayer_plugin", g_settings.movieplayer_plugin );