X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=cfaba777d2f26add33a344da7aacf17facc8931d;hp=23f3f62306c6a492b84d5e853c414f198248bde4;hb=474e817a724fdad4db635ba59202283fbcc22ef9;hpb=d528d3d185ca3bb9a40ec7af0299a83c0d2b76e0

diff --git a/main.cpp b/main.cpp
index 23f3f623..cfaba777 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,19 +23,23 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok/libsigrok.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
-#include <QApplication>
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
-#include "signalhandler.h"
+#include "signalhandler.hpp"
 #endif
 
-#include "pv/devicemanager.h"
-#include "pv/mainwindow.h"
+#include "pv/application.hpp"
+#include "pv/devicemanager.hpp"
+#include "pv/mainwindow.hpp"
+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/loghandler.hpp"
+#endif
 
 #include "config.h"
 
@@ -61,15 +65,15 @@ void usage()
 int main(int argc, char *argv[])
 {
 	int ret = 0;
-	struct sr_context *sr_ctx = NULL;
+	std::shared_ptr<sigrok::Context> context;
 	const char *open_file = NULL;
 
-	QApplication a(argc, argv);
+	Application a(argc, argv);
 
-	// Set some application metadata
-	QApplication::setApplicationVersion(PV_VERSION_STRING);
-	QApplication::setApplicationName("PulseView");
-	QApplication::setOrganizationDomain("sigrok.org");
+#ifdef ANDROID
+	srau_init_environment();
+	pv::AndroidLogHandler::install_callbacks();
+#endif
 
 	// Parse arguments
 	while (1) {
@@ -89,7 +93,7 @@ int main(int argc, char *argv[])
 		case 'l':
 		{
 			const int loglevel = atoi(optarg);
-			sr_log_loglevel_set(loglevel);
+			context->set_log_level(sigrok::LogLevel::get(loglevel));
 
 #ifdef ENABLE_DECODE
 			srd_log_loglevel_set(loglevel);
@@ -117,10 +121,7 @@ int main(int argc, char *argv[])
 		open_file = argv[argc - 1];
 
 	// Initialise libsigrok
-	if (sr_init(&sr_ctx) != SR_OK) {
-		qDebug() << "ERROR: libsigrok init failed.";
-		return 1;
-	}
+	context = sigrok::Context::create();
 
 	do {
 
@@ -137,7 +138,7 @@ int main(int argc, char *argv[])
 
 		try {
 			// Create the device manager, initialise the drivers
-			pv::DeviceManager device_manager(sr_ctx);
+			pv::DeviceManager device_manager(context);
 
 			// Initialise the main window
 			pv::MainWindow w(device_manager, open_file);
@@ -153,7 +154,7 @@ int main(int argc, char *argv[])
 				QObject::connect(handler,
 					SIGNAL(term_received()),
 					&w, SLOT(close()));
-    			} else {
+			} else {
 				qWarning() <<
 					"Could not prepare signal handler.";
 			}
@@ -173,9 +174,5 @@ int main(int argc, char *argv[])
 
 	} while (0);
 
-	// Destroy libsigrok
-	if (sr_ctx)
-		sr_exit(sr_ctx);
-
 	return ret;
 }