Merge pull request #82 from substring/fix-switchres--bin-logs

Fix switchres  bin logs

log.cpp

@@ -15,7 +15,7 @@
 #include "log.h"
 
 enum log_verbosity { NONE, ERROR, INFO, DEBUG };
-static log_verbosity log_level = ERROR;
+static log_verbosity log_level = INFO;
 
 void log_dummy(const char *, ...) {}
 
@@ -49,4 +49,12 @@ void set_log_verbosity(int level)
 	if(level > DEBUG)
 		level = DEBUG;
 	log_level = (log_verbosity)level;
+
+	// Reinit loggers
+	if (log_level < DEBUG)
+		log_verbose = &log_dummy;
+	if (log_level < INFO)
+		log_info = &log_dummy;
+	if (log_level < ERROR)
+		log_error = &log_dummy;
 }

switchres.cpp

@@ -107,6 +107,12 @@ switchres_manager::switchres_manager()
 
 	// Create our display manager
 	m_display_factory = new display_manager();
+
+	// Set logger properties
+	set_log_level(2);
+	set_log_info_fn((void*)printf);
+	set_log_error_fn((void*)printf);
+	set_log_verbose_fn((void*)printf);
 }
 
 //============================================================

switchres.ini

@@ -61,4 +61,4 @@ custom_timing             auto
 # 1: only errors
 # 2: general information
 # 3: debug messages
-verbosity                 1
+verbosity                 2

switchres_main.cpp

@@ -33,10 +33,6 @@ int main(int argc, char **argv)
 
 	switchres_manager switchres;
 
-	// Init logging
-	switchres.set_log_info_fn((void*)printf);
-	switchres.set_log_error_fn((void*)printf);
-
 	switchres.parse_config("switchres.ini");
 
 	int width = 0;
@@ -97,6 +93,9 @@ int main(int argc, char **argv)
 		switch (c)
 		{
 			case 'v':
+				switchres.set_log_level(3);
+				switchres.set_log_error_fn((void*)printf);
+				switchres.set_log_info_fn((void*)printf);
 				switchres.set_log_verbose_fn((void*)printf);
 				break;
 

switchres_wrapper.cpp

@@ -28,9 +28,6 @@ switchres_manager* swr;
 MODULE_API void sr_init() {
 	setlocale(LC_NUMERIC, "C");
 	swr = new switchres_manager;
-	//swr->set_log_verbose_fn((void *)printf);
-	//swr->set_log_info_fn((void *)printf);
-	//swr->set_log_error_fn((void *)printf);
 	swr->parse_config("switchres.ini");
 }