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

This commit is contained in:
Stefan Seyfried
2013-12-29 22:12:09 +01:00
19 changed files with 387 additions and 484 deletions

View File

@@ -679,6 +679,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.channellist_new_zap_mode = configfile.getInt32("channellist_new_zap_mode", 1);
g_settings.channellist_sort_mode = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat
g_settings.channellist_numeric_adjust = configfile.getInt32("channellist_numeric_adjust", 0);
g_settings.channellist_show_channellogo = configfile.getInt32("channellist_show_channellogo", 1);
//screen configuration
g_settings.screen_xres = configfile.getInt32("screen_xres", 100);
@@ -1170,6 +1171,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool ( "audiochannel_up_down_enable", g_settings.audiochannel_up_down_enable );
configfile.setInt32("channellist_sort_mode", g_settings.channellist_sort_mode);
configfile.setInt32("channellist_numeric_adjust", g_settings.channellist_numeric_adjust);
configfile.setInt32("channellist_show_channellogo", g_settings.channellist_show_channellogo);
//screen configuration
configfile.setInt32( "screen_xres", g_settings.screen_xres);