X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=07cfa2facfb9eefce062c243ad4f6d7ead0a417b;hp=a7ab89fbf7422ada41d7050ac57715ce33f7f05d;hb=7d0c935c488742ca45bdcd73bf8573e0e6f67aab;hpb=31e6731d976cb2b398c92763a9d3507437b8a826

diff --git a/main.cpp b/main.cpp
index a7ab89fb..07cfa2fa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,53 +18,43 @@
  * 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 <signal.h>
+#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(stderr,
+	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);
 }
 
-/*
- * SIGINT handler (likely recieved Ctrl-C from terminal)
- */
-void sigint(int param)
-{
-	(void) param;
-	
-	qDebug("pv: Recieved SIGINT");
-	
-	/* TODO: Handle SIGINT */
-}
-
 int main(int argc, char *argv[])
 {
 	int ret = 0;
 	struct sr_context *sr_ctx = NULL;
-
-	// Register a SIGINT handler
-	signal (SIGINT, sigint);
+	const char *open_file = NULL;
 
 	QApplication a(argc, argv);
 
@@ -76,20 +66,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'},
 			{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(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
 			return 0;
 
 		case 'h':
@@ -99,45 +99,66 @@ 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.";
 		return 1;
 	}
 
-	// Initialise libsigrokdecode
-	if (srd_init(NULL) == SRD_OK) {
+	do {
+
+		// Initialise libsigrokdecode
+		if (srd_init(NULL) != SRD_OK) {
+			qDebug() << "ERROR: libsigrokdecode init failed.";
+			break;
+		}
 
 		// 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;
-			}
-		}
+		try {
+			// Create the device manager, initialise the drivers
+			pv::DeviceManager device_manager(sr_ctx);
 
-		if (ret == 0) {
 			// Initialise the main window
-			pv::MainWindow w;
+			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();
 		}
 
-		// Destroy libsigrokdecode and libsigrok
+		// Destroy libsigrokdecode
 		srd_exit();
 
-	} else {
-		qDebug() << "ERROR: libsigrokdecode init failed.";
-	}
+	} while (0);
 
+	// Destroy libsigrok
 	if (sr_ctx)
 		sr_exit(sr_ctx);