diff --git a/rtengine/ex1simple.cc b/rtengine/ex1simple.cc index 334c21b71..22cb16487 100644 --- a/rtengine/ex1simple.cc +++ b/rtengine/ex1simple.cc @@ -43,7 +43,6 @@ int main (int argc, char* argv[]) { // create and fill settings rtengine::Settings* s = rtengine::Settings::create (); - s->dualThreadEnabled = true; s->demosaicMethod = "hphd"; s->colorCorrectionSteps = 2; s->iccDirectory = ""; diff --git a/rtengine/ex2simple.cc b/rtengine/ex2simple.cc index e59b05409..7ce0b1ffd 100644 --- a/rtengine/ex2simple.cc +++ b/rtengine/ex2simple.cc @@ -82,7 +82,6 @@ int main (int argc, char* argv[]) { // create and fill settings rtengine::Settings* s = rtengine::Settings::create (); - s->dualThreadEnabled = true; s->demosaicMethod = "hphd"; s->colorCorrectionSteps = 2; s->iccDirectory = ""; diff --git a/rtengine/rtetest.cc b/rtengine/rtetest.cc index ca8e28a49..ab46a4dfb 100644 --- a/rtengine/rtetest.cc +++ b/rtengine/rtetest.cc @@ -40,7 +40,6 @@ int main (int argc, char* argv[]) { } rtengine::Settings s; - s.dualThreadEnabled = true; s.demosaicMethod = "hphd"; s.colorCorrectionSteps = 2; s.iccDirectory = ""; diff --git a/rtengine/settings.h b/rtengine/settings.h index 4659d4ed1..16efcc96c 100644 --- a/rtengine/settings.h +++ b/rtengine/settings.h @@ -24,7 +24,6 @@ namespace rtengine { /** This structure holds the global parameters used by the RT engine. */ class Settings { public: - bool dualThreadEnabled; ///< If true, the image processing operations with utilize two processor cores (if possible) Glib::ustring iccDirectory; ///< The directory containing the possible output icc profiles int colorimetricIntent; ///< Colorimetric intent used at color space conversions Glib::ustring monitorProfile; ///< ICC profile of the monitor (full path recommended) diff --git a/rtgui/options.cc b/rtgui/options.cc index 02ebd3f79..75eda2223 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -110,7 +110,7 @@ void Options::setDefaults () { languageAutoDetect= langMgr.isOSLanguageDetectSupported(); lastSaveAsPath = ""; overwriteOutputFile = false; // if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc. - theme = "17-Gray-Red"; + theme = "25-Gray-Gray"; slimUI = false; // TODO: Should this be TRUE for worst case screen resolution or FALSE for nicer interface by default ??? useSystemTheme = true; maxThumbnailHeight = 400; @@ -206,7 +206,6 @@ void Options::setDefaults () { }; baBehav = std::vector (babehav, babehav+ADDSET_PARAM_NUM); - rtSettings.dualThreadEnabled = true; rtSettings.darkFramesPath = ""; rtSettings.flatFieldsPath = ""; #ifdef WIN32 @@ -274,7 +273,6 @@ if (keyFile.has_group ("General")) { if (keyFile.has_key ("General", "DateFormat")) dateFormat = keyFile.get_string ("General", "DateFormat"); if (keyFile.has_key ("General", "AdjusterDelay")) adjusterDelay = keyFile.get_integer ("General", "AdjusterDelay"); if (keyFile.has_key ("General", "StoreLastProfile")) savesParamsAtExit = keyFile.get_boolean ("General", "StoreLastProfile"); - if (keyFile.has_key ("General", "DualProcSupport")) rtSettings.dualThreadEnabled = keyFile.get_boolean ("General", "DualProcSupport"); if (keyFile.has_key ("General", "MultiUser")) multiUser = keyFile.get_boolean ("General", "MultiUser"); if (keyFile.has_key ("General", "Version")) version = keyFile.get_string ("General", "Version"); if (keyFile.has_key ("General", "Language")) language = keyFile.get_string ("General", "Language"); @@ -451,7 +449,6 @@ int Options::saveToFile (Glib::ustring fname) { keyFile.set_string ("General", "StartupPath", startupPath); keyFile.set_string ("General", "DateFormat", dateFormat); keyFile.set_integer ("General", "AdjusterDelay", adjusterDelay); - keyFile.set_boolean ("General", "DualProcSupport", rtSettings.dualThreadEnabled); keyFile.set_boolean ("General", "MultiUser", multiUser); keyFile.set_string ("General", "Language", language); keyFile.set_boolean ("General", "LanguageAutoDetect", languageAutoDetect);