X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=fef53247deb71820a424050f899f31f7a297f350;hp=fae6d5f20927149d4996aa0a161f07db8628580e;hb=9b5099b654d1d631ef6f46b10f0d85b2994916d1;hpb=e82fd481f744e0cccdad1d3552118280735ca8e5

diff --git a/main.cpp b/main.cpp
index fae6d5f2..fef53247 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,9 +39,10 @@ void usage()
 {
 	fprintf(stdout,
 		"Usage:\n"
-		"  %s — %s\n"
+		"  %s [OPTION…] [FILE] — %s\n"
 		"\n"
 		"Help Options:\n"
+		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
 		"  -V, --version                   Show release version\n"
 		"  -h, -?, --help                  Show help option\n"
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
@@ -64,6 +65,7 @@ int main(int argc, char *argv[])
 {
 	int ret = 0;
 	struct sr_context *sr_ctx = NULL;
+	const char *open_file = NULL;
 
 	// Register a SIGINT handler
 	signal(SIGINT, sigint_handler);
@@ -80,17 +82,26 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
+			{"loglevel", required_argument, 0, 'l'},
 			{"version", no_argument, 0, 'V'},
 			{"help", no_argument, 0, 'h'},
 			{0, 0, 0, 0}
 		};
 
-		const char c = getopt_long(argc, argv,
-			"Vh?", long_options, NULL);
+		const int c = getopt_long(argc, argv,
+			"l:Vh?", long_options, NULL);
 		if (c == -1)
 			break;
 
 		switch (c) {
+		case 'l':
+		{
+			const int loglevel = atoi(optarg);
+			sr_log_loglevel_set(loglevel);
+			srd_log_loglevel_set(loglevel);
+			break;
+		}
+
 		case 'V':
 			// Print version info
 			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
@@ -103,6 +114,12 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (argc - optind > 1) {
+		fprintf(stderr, "Only one file can be openened.\n");
+		return 1;
+	} else if (argc - optind == 1)
+		open_file = argv[argc - 1];
+
 	// Initialise libsigrok
 	if (sr_init(&sr_ctx) != SR_OK) {
 		qDebug() << "ERROR: libsigrok init failed.";
@@ -128,7 +145,7 @@ int main(int argc, char *argv[])
 
 		if (ret == 0) {
 			// Initialise the main window
-			pv::MainWindow w;
+			pv::MainWindow w(open_file);
 			w.show();
 
 			// Run the application