projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Use pv::data::SignalBase namespace
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index f7c722b1aec63a6e47d440a565bb23824fadd461..8f495419fee7467de77c4074c32927ce658de919 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-36,6
+36,7
@@
#include "pv/application.hpp"
#include "pv/devicemanager.hpp"
#include "pv/mainwindow.hpp"
#include "pv/application.hpp"
#include "pv/devicemanager.hpp"
#include "pv/mainwindow.hpp"
+#include "pv/session.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
#include "android/assetreader.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
#include "android/assetreader.hpp"
@@
-162,6
+163,8
@@
int main(int argc, char *argv[])
// Initialise libsigrok
context = sigrok::Context::create();
// Initialise libsigrok
context = sigrok::Context::create();
+ pv::Session::sr_context = context;
+
#ifdef ANDROID
context->set_resource_reader(&asset_reader);
#endif
#ifdef ANDROID
context->set_resource_reader(&asset_reader);
#endif