From c67cd22b1c70b94071d280ca2c1cc949891b0bec Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 16 Mar 2011 10:59:06 +0000 Subject: [PATCH] Save / restore last used net interface git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1304 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c49b09e7c9d0d4ed89bddc09d6a621ed1786ad52 Author: [CST] Focus Date: 2011-03-16 (Wed, 16 Mar 2011) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 5 ++++- src/system/settings.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 239aa748f..e2e298e2a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -520,6 +520,8 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.network_ntprefresh = configfile.getString("network_ntprefresh", "30" ); g_settings.network_ntpenable = configfile.getBool("network_ntpenable", false); + snprintf(g_settings.ifname, sizeof(g_settings.ifname), "%s", configfile.getString("ifname", "eth0").c_str());; + g_settings.epg_save = configfile.getBool("epg_save", false); //widget settings @@ -1069,6 +1071,8 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setString( "network_ntprefresh", g_settings.network_ntprefresh); configfile.setBool( "network_ntpenable", g_settings.network_ntpenable); + configfile.setString("ifname", g_settings.ifname); + //widget settings configfile.setBool("widget_fade" , g_settings.widget_fade ); @@ -2205,7 +2209,6 @@ int CNeutrinoApp::run(int argc, char **argv) NVODChanger = new CNVODChangeExec; StreamFeaturesChanger = new CStreamFeaturesChangeExec; MoviePluginChanger = new CMoviePluginChangeExec; - MyIPChanger = new CIPChangeNotifier; ConsoleDestinationChanger = new CConsoleDestChangeNotifier; rcLock = new CRCLock(); //USERMENU diff --git a/src/system/settings.h b/src/system/settings.h index 6a417fe39..af09e71e4 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -120,9 +120,12 @@ struct SNeutrinoSettings std::string epg_max_events; std::string epg_extendedcache; std::string epg_dir; + + //network std::string network_ntpserver; std::string network_ntprefresh; int network_ntpenable; + char ifname[10]; //timing #define TIMING_SETTING_COUNT 6