X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=daec62d2af09055409677d90885bc9faac5ce4af;hp=61ec03a840243be3dd11f4654d8c9f6fa76b6590;hb=2220e94218298b208041c5e828595d9e1b842c88;hpb=e3c79b07a04a6621e7f3d8d36c1afac5ef7d0db5

diff --git a/main.cpp b/main.cpp
index 61ec03a8..daec62d2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,6 +38,7 @@
 #include "pv/mainwindow.hpp"
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/assetreader.hpp"
 #include "android/loghandler.hpp"
 #endif
 
@@ -77,6 +78,7 @@ int main(int argc, char *argv[])
 #ifdef ANDROID
 	srau_init_environment();
 	pv::AndroidLogHandler::install_callbacks();
+	pv::AndroidAssetReader asset_reader;
 #endif
 
 	// Parse arguments
@@ -128,14 +130,18 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (argc != optind) {
-		fprintf(stderr, "Unexpected argument: %s\n", argv[optind]);
+	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
 	context = sigrok::Context::create();
-
+#ifdef ANDROID
+	context->set_resource_reader(&asset_reader);
+#endif
 	do {
 
 #ifdef ENABLE_DECODE
@@ -159,7 +165,7 @@ int main(int argc, char *argv[])
 			w.show();
 
 #ifdef ENABLE_SIGNALS
-			if(SignalHandler::prepare_signals()) {
+			if (SignalHandler::prepare_signals()) {
 				SignalHandler *const handler =
 					new SignalHandler(&w);
 				QObject::connect(handler,