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

diff --git a/main.cpp b/main.cpp
index fef53247..5c3e5b25 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,22 +18,36 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include <signal.h>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#endif
+
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
 #include <QDebug>
 
+#ifdef ENABLE_SIGNALS
+#include "signalhandler.h"
+#endif
+
+#include "pv/application.h"
+#include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/loghandler.h"
+#endif
 
 #include "config.h"
 
-// Global pointer to our QApplication
-QApplication *g_app = NULL;
+#ifdef _WIN32
+// The static qsvg lib is required for SVG graphics/icons (on Windows).
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
 
 void usage()
 {
@@ -48,36 +62,18 @@ 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;
 	const char *open_file = NULL;
 
-	// Register a SIGINT handler
-	signal(SIGINT, sigint_handler);
+	Application a(argc, argv);
 
-	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);
-	QApplication::setApplicationName("PulseView");
-	QApplication::setOrganizationDomain("http://www.sigrok.org");
+#ifdef ANDROID
+	srau_init_environment();
+	pv::AndroidLogHandler::install_callbacks();
+#endif
 
 	// Parse arguments
 	while (1) {
@@ -98,7 +94,11 @@ int main(int argc, char *argv[])
 		{
 			const int loglevel = atoi(optarg);
 			sr_log_loglevel_set(loglevel);
+
+#ifdef ENABLE_DECODE
 			srd_log_loglevel_set(loglevel);
+#endif
+
 			break;
 		}
 
@@ -126,39 +126,58 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	// Initialise libsigrokdecode
-	if (srd_init(NULL) == SRD_OK) {
+	do {
+
+#ifdef ENABLE_DECODE
+		// Initialise libsigrokdecode
+		if (srd_init(NULL) != SRD_OK) {
+			qDebug() << "ERROR: libsigrokdecode init failed.";
+			break;
+		}
 
 		// Load the protocol decoders
 		srd_decoder_load_all();
+#endif
 
-		// 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(open_file);
+			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
+#ifdef ENABLE_DECODE
+		// Destroy libsigrokdecode
 		srd_exit();
+#endif
 
-	} else {
-		qDebug() << "ERROR: libsigrokdecode init failed.";
-	}
+	} while (0);
 
+	// Destroy libsigrok
 	if (sr_ctx)
 		sr_exit(sr_ctx);