X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=97a61280ac5bc0462dc2da35d179ecd129a54ecf;hp=715dc526c2f07fce90eb9d111cf253acf57dc09a;hb=3e5bc2687fc23309ad46872fc5accde2af82ea87;hpb=140181a46034cf65739ba4bf0bf1260ab94ac736

diff --git a/main.cpp b/main.cpp
index 715dc526..97a61280 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,108 +18,131 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#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 <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
-#include <QtGui/QApplication>
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
-#include "signalhandler.h"
+#include "signalhandler.hpp"
 #endif
 
-#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"
 
+#ifdef _WIN32
+// The static qsvg lib is required for SVG graphics/icons (on Windows).
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
+
 void usage()
 {
 	fprintf(stdout,
 		"Usage:\n"
-		"  %s [OPTION…] [FILE] — %s\n"
+		"  %s [OPTION…] — %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"
+		"Application Options:\n"
+		"  -V, --version                   Show release version\n"
+		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
+		"  -i, --input-file                Load input from file\n"
+		"  -I, --input-format              Input format\n"
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
 int main(int argc, char *argv[])
 {
 	int ret = 0;
-	struct sr_context *sr_ctx = NULL;
-	const char *open_file = NULL;
+	std::shared_ptr<sigrok::Context> context;
+	std::string open_file, open_file_format;
 
-	QApplication a(argc, argv);
+	Application a(argc, argv);
 
-	// 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) {
 		static const struct option long_options[] = {
-			{"loglevel", required_argument, 0, 'l'},
-			{"version", no_argument, 0, 'V'},
 			{"help", no_argument, 0, 'h'},
+			{"version", no_argument, 0, 'V'},
+			{"loglevel", required_argument, 0, 'l'},
+			{"input-file", required_argument, 0, 'i'},
+			{"input-format", required_argument, 0, 'I'},
 			{0, 0, 0, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
-			"l:Vh?", long_options, NULL);
+			"l:Vh?i:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
 		switch (c) {
+		case 'h':
+		case '?':
+			usage();
+			return 0;
+
+		case 'V':
+			// Print version info
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			return 0;
+
 		case 'l':
 		{
 			const int loglevel = atoi(optarg);
-			sr_log_loglevel_set(loglevel);
+			context->set_log_level(sigrok::LogLevel::get(loglevel));
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
 			srd_log_loglevel_set(loglevel);
 #endif
 
 			break;
 		}
 
-		case 'V':
-			// Print version info
-			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
-			return 0;
+		case 'i':
+			open_file = optarg;
+			break;
 
-		case 'h':
-		case '?':
-			usage();
-			return 0;
+		case 'I':
+			open_file_format = optarg;
+			break;
 		}
 	}
 
 	if (argc - optind > 1) {
 		fprintf(stderr, "Only one file can be openened.\n");
 		return 1;
-	} else if (argc - optind == 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;
-	}
+	context = sigrok::Context::create();
 
 	do {
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
 		// Initialise libsigrokdecode
-		if (srd_init(NULL) != SRD_OK) {
+		if (srd_init(nullptr) != SRD_OK) {
 			qDebug() << "ERROR: libsigrokdecode init failed.";
 			break;
 		}
@@ -128,24 +151,17 @@ int main(int argc, char *argv[])
 		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(context);
 
-		if (ret == 0) {
 			// Initialise the main window
-			pv::MainWindow w(open_file);
+			pv::MainWindow w(device_manager,
+				open_file, open_file_format);
 			w.show();
 
 #ifdef ENABLE_SIGNALS
-			if(SignalHandler::prepare_signals()) {
+			if (SignalHandler::prepare_signals()) {
 				SignalHandler *const handler =
 					new SignalHandler(&w);
 				QObject::connect(handler,
@@ -154,7 +170,7 @@ int main(int argc, char *argv[])
 				QObject::connect(handler,
 					SIGNAL(term_received()),
 					&w, SLOT(close()));
-    			} else {
+			} else {
 				qWarning() <<
 					"Could not prepare signal handler.";
 			}
@@ -162,18 +178,17 @@ int main(int argc, char *argv[])
 
 			// Run the application
 			ret = a.exec();
+
+		} catch(std::exception e) {
+			qDebug() << e.what();
 		}
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
 		// Destroy libsigrokdecode
 		srd_exit();
 #endif
 
 	} while (0);
 
-	// Destroy libsigrok
-	if (sr_ctx)
-		sr_exit(sr_ctx);
-
 	return ret;
 }