X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=main.cpp;h=e98506fcc0ea19d2d0dc2572252d3ab85748eca4;hb=9fd5bb6e6468eb6d211aff682f3a64e7f070bb44;hp=b7ba5d8994e79c3d5fea053a2d59802ee378d16c;hpb=d4384c6d5c7cb6dc16979c650cd21aa29f0aedb5;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index b7ba5d8..e98506f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,6 +20,7 @@
 
 extern "C" {
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 }
@@ -33,9 +34,12 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
 void usage()
 {
-	fprintf(stderr,
+	fprintf(stdout,
 		"Usage:\n"
 		"  %s — %s\n"
 		"\n"
@@ -45,9 +49,30 @@ void usage()
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
+/*
+ * SIGINT handler (likely received Ctrl-C from terminal)
+ */
+void sigint_handler(int param)
+{
+	(void)param;
+
+	qDebug("Received SIGINT.");
+
+	if (g_app)
+		g_app->quit();
+}
+
 int main(int argc, char *argv[])
 {
+	int ret = 0;
+	struct sr_context *sr_ctx = NULL;
+
+	// Register a SIGINT handler
+	signal(SIGINT, sigint_handler);
+
 	QApplication a(argc, argv);
+	// Now we have an application to populate our global pointer
+	g_app = &a;
 
 	// Set some application metadata
 	QApplication::setApplicationVersion(PV_VERSION_STRING);
@@ -57,8 +82,8 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"version", no_argument, 0,  'V'},
-			{"help", no_argument, 0,  'h'},
+			{"version", no_argument, 0, 'V'},
+			{"help", no_argument, 0, 'h'},
 			{0, 0, 0, 0}
 		};
 
@@ -70,7 +95,7 @@ int main(int argc, char *argv[])
 		switch (c) {
 		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':
@@ -81,40 +106,46 @@ int main(int argc, char *argv[])
 	}
 
 	// 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;
-	}
+	if (srd_init(NULL) == SRD_OK) {
+
+		// Load the protocol decoders
+		srd_decoder_load_all();
+
+		// Initialize all libsigrok drivers
+		sr_dev_driver **const drivers = sr_driver_list();
+		for (sr_dev_driver **driver = drivers; *driver; driver++) {
+			if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
+				qDebug("Failed to initialize driver %s",
+					(*driver)->name);
+				ret = 1;
+				break;
+			}
+		}
 
-	// Load the protocol decoders
-	srd_decoder_load_all();
+		if (ret == 0) {
+			// Initialise the main window
+			pv::MainWindow w;
+			w.show();
 
-	// 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;
+			// Run the application
+			ret = a.exec();
 		}
-	}
 
-	// Initialise the main window
-	pv::MainWindow w;
-	w.show();
+		// Destroy libsigrokdecode and libsigrok
+		srd_exit();
 
-	// Run the application
-	const int ret = a.exec();
+	} else {
+		qDebug() << "ERROR: libsigrokdecode init failed.";
+	}
 
-	// Destroy libsigrokdecode and libsigrok
-	srd_exit();
-	sr_exit();
+	if (sr_ctx)
+		sr_exit(sr_ctx);
 
 	return ret;
 }