X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=07cfa2facfb9eefce062c243ad4f6d7ead0a417b;hp=a94f64c67b07b60b45cf2b96b5cb1fc264fbf8c6;hb=728fcafc9897d3ffb4a109b6248d88b0945128f5;hpb=f7951df4a17a5c7e831dd20d43049137b5761e85

diff --git a/main.cpp b/main.cpp
index a94f64c6..07cfa2fa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,23 +18,44 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
-}
 
 #include <getopt.h>
 
 #include <QtGui/QApplication>
 #include <QDebug>
 
+#ifdef ENABLE_SIGNALS
+#include "signalhandler.h"
+#endif
+
+#include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
 
 #include "config.h"
 
+void usage()
+{
+	fprintf(stdout,
+		"Usage:\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);
+}
+
 int main(int argc, char *argv[])
 {
+	int ret = 0;
+	struct sr_context *sr_ctx = NULL;
+	const char *open_file = NULL;
+
 	QApplication a(argc, argv);
 
 	// Set some application metadata
@@ -45,57 +66,101 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"version", no_argument, 0,  'V'},
+			{"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, "V", 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(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			return 0;
+
+		case 'h':
+		case '?':
+			usage();
 			return 0;
 		}
 	}
 
+	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_OK) {
+	if (sr_init(&sr_ctx) != SR_OK) {
 		qDebug() << "ERROR: libsigrok init failed.";
 		return 1;
 	}
 
-	// Initialise libsigrokdecode
-	if (srd_init(NULL) != SRD_OK) {
-		qDebug() << "ERROR: libsigrokdecode init failed.";
-		return 1;
-	}
+	do {
 
-	// Load the protocol decoders
-	srd_decoder_load_all();
+		// Initialise libsigrokdecode
+		if (srd_init(NULL) != SRD_OK) {
+			qDebug() << "ERROR: libsigrokdecode init failed.";
+			break;
+		}
 
-	// Initialize all libsigrok drivers
-	sr_dev_driver **const drivers = sr_driver_list();
-	for (sr_dev_driver **driver = drivers; *driver; driver++) {
-		if (sr_driver_init(*driver) != SR_OK) {
-			qDebug("Failed to initialize driver %s",
-				(*driver)->name);
-			return 1;
+		// Load the protocol decoders
+		srd_decoder_load_all();
+
+		try {
+			// Create the device manager, initialise the drivers
+			pv::DeviceManager device_manager(sr_ctx);
+
+			// Initialise the main window
+			pv::MainWindow w(device_manager, open_file);
+			w.show();
+
+#ifdef ENABLE_SIGNALS
+			if(SignalHandler::prepare_signals()) {
+				SignalHandler *const handler =
+					new SignalHandler(&w);
+				QObject::connect(handler,
+					SIGNAL(int_received()),
+					&w, SLOT(close()));
+				QObject::connect(handler,
+					SIGNAL(term_received()),
+					&w, SLOT(close()));
+    			} else {
+				qWarning() <<
+					"Could not prepare signal handler.";
+			}
+#endif
+
+			// Run the application
+			ret = a.exec();
+
+		} catch(std::exception e) {
+			qDebug() << e.what();
 		}
-	}
 
-	// Initialise the main window
-	pv::MainWindow w;
-	w.show();
+		// Destroy libsigrokdecode
+		srd_exit();
 
-	// Run the application
-	const int ret = a.exec();
+	} while (0);
 
-	// Destroy libsigrokdecode and libsigrok
-	srd_exit();
-	sr_exit();
+	// Destroy libsigrok
+	if (sr_ctx)
+		sr_exit(sr_ctx);
 
 	return ret;
 }