X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=78a131a5f1e108c9548cc34f1f19ea5bea6e6abb;hp=623972395c6c91e61b1d0dfe62590f83ba8a502f;hb=4ca23e7d62d75523710fe4117f904ded4d26544a;hpb=f32905530347e1020d5ce7959123cf797c9a4829

diff --git a/main.cpp b/main.cpp
index 62397239..78a131a5 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,17 +78,18 @@ int main(int argc, char *argv[])
 #ifdef ANDROID
 	srau_init_environment();
 	pv::AndroidLogHandler::install_callbacks();
+	pv::AndroidAssetReader asset_reader;
 #endif
 
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"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}
+			{"help", no_argument, nullptr, 'h'},
+			{"version", no_argument, nullptr, 'V'},
+			{"loglevel", required_argument, nullptr, 'l'},
+			{"input-file", required_argument, nullptr, 'i'},
+			{"input-format", required_argument, nullptr, 'I'},
+			{nullptr, 0, nullptr, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
@@ -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 opened.\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
@@ -177,7 +183,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch(std::exception e) {
+		} catch (std::exception e) {
 			qDebug() << e.what();
 		}