DecodeTrace: Try to keep annotation labels within the view

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 97a61280ac5bc0462dc2da35d179ecd129a54ecf..3e00479664aeb5f4b6a151a9d853fd6ac54da605 100644 (file)
--- 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
@@ -129,7 +131,7 @@ int main(int argc, char *argv[])
        }
 
        if (argc - optind > 1) {
-               fprintf(stderr, "Only one file can be openened.\n");
+               fprintf(stderr, "Only one file can be opened.\n");
                return 1;
        } else if (argc - optind == 1) {
                open_file = argv[argc - 1];
@@ -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();
                }