moved log level from configure to setting

[chaz/yoink] / src / MainLayer.cc

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 5f097ea9438a5cd8e9bd9cd6b8721b3c0f2e991b..ad2dbbc5f22d9a607f69327783032eee338c4236 100644 (file)
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -289,17 +289,6 @@ int main(int argc, char* argv[])
        }
 
 
-#if        YOINK_LOGLEVEL >= 3
-       Mf::Log::setLevel(Mf::Log::INFO);
-#elif  YOINK_LOGLEVEL >= 2
-       Mf::Log::setLevel(Mf::Log::WARNING);
-#elif  YOINK_LOGLEVEL >= 1
-       Mf::Log::setLevel(Mf::Log::ERROR);
-#elif  YOINK_LOGLEVEL
-       Mf::Log::setLevel(Mf::Log::NONE);
-#endif
-
-
        // Add search paths; they should be searched in this order:
        // 1. YOINK_DATADIR (environment)
        // 2. YOINK_DATADIR (configure)
@@ -319,9 +308,7 @@ int main(int argc, char* argv[])
        // 3. $HOME/.yoinkrc
        // 4. YOINKRC (environment)
 
-       std::string configFiles;
-
-       configFiles += Mf::Resource::getPath("yoinkrc");
+       std::string configFiles = Mf::Resource::getPath("yoinkrc");
 #if !defined(_WIN32) && !defined(__WIN32__)
        configFiles += ":/etc/yoinkrc";
 #endif
@@ -337,6 +324,10 @@ int main(int argc, char* argv[])
        Mf::Settings& settings = Mf::Settings::getInstance();
        settings.loadFromFile(configFiles);
        settings.parseArgs(argc, argv);
+
+       Mf::Log::Level logLevel;
+       if (settings.get("loglevel", logLevel)) Mf::Log::setLevel(logLevel);
+
        Mf::engine.initWithSettings(settings);
 
        std::string iconFile = Mf::Resource::getPath(PACKAGE".png");