X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=97a61280ac5bc0462dc2da35d179ecd129a54ecf;hp=74d13fdc4af1b0eeb9e9b3d3e1d64169597b8dd9;hb=3e5bc2687fc23309ad46872fc5accde2af82ea87;hpb=360ab9be5d6060d05cd7d40f5a50f7eafb787290

diff --git a/main.cpp b/main.cpp
index 74d13fdc..97a61280 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
@@ -53,12 +53,16 @@ void usage()
 {
 	fprintf(stdout,
 		"Usage:\n"
-		"  %s [OPTION…] [FILE] — %s\n"
+		"  %s [OPTION…] — %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"
+		"Application Options:\n"
+		"  -V, --version                   Show release version\n"
+		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
+		"  -i, --input-file                Load input from file\n"
+		"  -I, --input-format              Input format\n"
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
@@ -66,7 +70,7 @@ int main(int argc, char *argv[])
 {
 	int ret = 0;
 	std::shared_ptr<sigrok::Context> context;
-	const char *open_file = NULL;
+	std::string open_file, open_file_format;
 
 	Application a(argc, argv);
 
@@ -78,18 +82,30 @@ 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'},
+			{"version", no_argument, 0, 'V'},
+			{"loglevel", required_argument, 0, 'l'},
+			{"input-file", required_argument, 0, 'i'},
+			{"input-format", required_argument, 0, 'I'},
 			{0, 0, 0, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
-			"l:Vh?", long_options, NULL);
+			"l:Vh?i:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
 		switch (c) {
+		case 'h':
+		case '?':
+			usage();
+			return 0;
+
+		case 'V':
+			// Print version info
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			return 0;
+
 		case 'l':
 		{
 			const int loglevel = atoi(optarg);
@@ -102,23 +118,22 @@ int main(int argc, char *argv[])
 			break;
 		}
 
-		case 'V':
-			// Print version info
-			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
-			return 0;
+		case 'i':
+			open_file = optarg;
+			break;
 
-		case 'h':
-		case '?':
-			usage();
-			return 0;
+		case 'I':
+			open_file_format = optarg;
+			break;
 		}
 	}
 
 	if (argc - optind > 1) {
 		fprintf(stderr, "Only one file can be openened.\n");
 		return 1;
-	} else if (argc - optind == 1)
+	} else if (argc - optind == 1) {
 		open_file = argv[argc - 1];
+	}
 
 	// Initialise libsigrok
 	context = sigrok::Context::create();
@@ -127,7 +142,7 @@ int main(int argc, char *argv[])
 
 #ifdef ENABLE_DECODE
 		// Initialise libsigrokdecode
-		if (srd_init(NULL) != SRD_OK) {
+		if (srd_init(nullptr) != SRD_OK) {
 			qDebug() << "ERROR: libsigrokdecode init failed.";
 			break;
 		}
@@ -141,11 +156,12 @@ int main(int argc, char *argv[])
 			pv::DeviceManager device_manager(context);
 
 			// Initialise the main window
-			pv::MainWindow w(device_manager, open_file);
+			pv::MainWindow w(device_manager,
+				open_file, open_file_format);
 			w.show();
 
 #ifdef ENABLE_SIGNALS
-			if(SignalHandler::prepare_signals()) {
+			if (SignalHandler::prepare_signals()) {
 				SignalHandler *const handler =
 					new SignalHandler(&w);
 				QObject::connect(handler,