X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=d2512331157f4e23ac51d50ee725b9708716b35d;hp=640168ff79b8c316f7638cfa423e5625cffe0251;hb=d0f22e70fac3829be356143b4f2b6693f162f682;hpb=c1a688dec0b117146a47cc5200e5bc81e445fd2c

diff --git a/main.cpp b/main.cpp
index 640168ff..d2512331 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,6 +41,8 @@
 
 #include "pv/application.hpp"
 #include "pv/devicemanager.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/logging.hpp"
 #include "pv/mainwindow.hpp"
 #include "pv/session.hpp"
 
@@ -90,6 +92,7 @@ void usage()
 		"  -i, --input-file                Load input from file\n"
 		"  -I, --input-format              Input format\n"
 		"  -c, --clean                     Don't restore previous sessions on startup\n"
+		"  -s, --log-to-stdout             Don't use logging, output to stdout instead\n"
 		"\n", PV_BIN_NAME);
 }
 
@@ -100,6 +103,7 @@ int main(int argc, char *argv[])
 	string open_file, open_file_format, driver;
 	bool restore_sessions = true;
 	bool do_scan = true;
+	bool do_logging = true;
 
 	Application a(argc, argv);
 
@@ -116,14 +120,16 @@ int main(int argc, char *argv[])
 			{"version", no_argument, nullptr, 'V'},
 			{"loglevel", required_argument, nullptr, 'l'},
 			{"driver", required_argument, nullptr, 'd'},
+			{"no-scan", no_argument, nullptr, 'D'},
 			{"input-file", required_argument, nullptr, 'i'},
 			{"input-format", required_argument, nullptr, 'I'},
 			{"clean", no_argument, nullptr, 'c'},
+			{"log-to-stdout", no_argument, nullptr, 's'},
 			{nullptr, 0, nullptr, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
-			"l:Vhc?d:Di:I:", long_options, nullptr);
+			"h?VDcsl:d:i:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
@@ -178,6 +184,10 @@ int main(int argc, char *argv[])
 		case 'c':
 			restore_sessions = false;
 			break;
+
+		case 's':
+			do_logging = false;
+			break;
 		}
 	}
 
@@ -189,6 +199,13 @@ int main(int argc, char *argv[])
 	if (argc - optind == 1)
 		open_file = argv[argc - 1];
 
+	// Prepare the global settings since logging needs them early on
+	pv::GlobalSettings settings;
+	settings.set_defaults_where_needed();
+
+	if (do_logging)
+		pv::logging.init();
+
 	// Initialise libsigrok
 	context = sigrok::Context::create();
 	pv::Session::sr_context = context;