X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=7ac7ef36f66c713dcd9ef80f0595000d7f54d53e;hp=97a61280ac5bc0462dc2da35d179ecd129a54ecf;hb=24fa726ff2bbd151264336e764a748b8f4d40968;hpb=3e5bc2687fc23309ad46872fc5accde2af82ea87

diff --git a/main.cpp b/main.cpp
index 97a61280..7ac7ef36 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
@@ -137,7 +139,9 @@ int main(int argc, char *argv[])
 
 	// Initialise libsigrok
 	context = sigrok::Context::create();
-
+#ifdef ANDROID
+	context->set_resource_reader(&asset_reader);
+#endif
 	do {
 
 #ifdef ENABLE_DECODE
@@ -179,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();
 		}