projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32: Re-fix the Windows build (namespace pollution via windows.h).
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 623972395c6c91e61b1d0dfe62590f83ba8a502f..daec62d2af09055409677d90885bc9faac5ce4af 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-38,6
+38,7
@@
#include "pv/mainwindow.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
#include "pv/mainwindow.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/assetreader.hpp"
#include "android/loghandler.hpp"
#endif
#include "android/loghandler.hpp"
#endif
@@
-77,6
+78,7
@@
int main(int argc, char *argv[])
#ifdef ANDROID
srau_init_environment();
pv::AndroidLogHandler::install_callbacks();
#ifdef ANDROID
srau_init_environment();
pv::AndroidLogHandler::install_callbacks();
+ pv::AndroidAssetReader asset_reader;
#endif
// Parse arguments
#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;
return 1;
+ } else if (argc - optind == 1) {
+ open_file = argv[argc - 1];
}
// Initialise libsigrok
context = sigrok::Context::create();
}
// Initialise libsigrok
context = sigrok::Context::create();
-
+#ifdef ANDROID
+ context->set_resource_reader(&asset_reader);
+#endif
do {
#ifdef ENABLE_DECODE
do {
#ifdef ENABLE_DECODE