Merge branch 'dvbsi++' into next

This commit is contained in:
[CST] Focus
2013-01-31 17:40:19 +04:00
13 changed files with 179 additions and 24 deletions

View File

@@ -615,6 +615,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.channellist_foot = configfile.getInt32("channellist_foot" , 1);//default next Event
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_minitv = configfile.getInt32("channellist_minitv", 0); //default off
//screen configuration
g_settings.screen_xres = configfile.getInt32("screen_xres", 100);
@@ -1035,6 +1036,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool("channellist_extended" , g_settings.channellist_extended);
configfile.setInt32("channellist_foot" , g_settings.channellist_foot);
configfile.setInt32("channellist_new_zap_mode", g_settings.channellist_new_zap_mode);
configfile.setInt32("channellist_minitv", g_settings.channellist_minitv);
configfile.setInt32("remote_control_hardware", g_settings.remote_control_hardware);
configfile.setBool ( "audiochannel_up_down_enable", g_settings.audiochannel_up_down_enable );
configfile.setInt32("channellist_sort_mode", g_settings.channellist_sort_mode);