X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=c0ac04b475d49b9ac2330856ceded776ab34e292;hp=0d59baef16847a8735f22b8f9e7ff081e1582e53;hb=ef40ad83ac7e2cb12b4ecfede4564ba3ef416905;hpb=9137928c9a711ff6d7bf25c9627236d3c61f069e

diff --git a/main.cpp b/main.cpp
index 0d59baef..c0ac04b4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,20 +23,21 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
 
 #include <getopt.h>
 
-#include <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
 
@@ -64,17 +65,13 @@ 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);
-
-	// Set some application metadata
-	QApplication::setApplicationVersion(PV_VERSION_STRING);
-	QApplication::setApplicationName("PulseView");
-	QApplication::setOrganizationDomain("sigrok.org");
+	Application a(argc, argv);
 
 #ifdef ANDROID
+	srau_init_environment();
 	pv::AndroidLogHandler::install_callbacks();
 #endif
 
@@ -96,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);
@@ -124,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 {
 
@@ -144,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);
@@ -180,9 +174,5 @@ int main(int argc, char *argv[])
 
 	} while (0);
 
-	// Destroy libsigrok
-	if (sr_ctx)
-		sr_exit(sr_ctx);
-
 	return ret;
 }