projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add logging mechanism
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 640168ff79b8c316f7638cfa423e5625cffe0251..feff17aaf47cd54299ff114871e32247aceedce1 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-41,6
+41,8
@@
#include "pv/application.hpp"
#include "pv/devicemanager.hpp"
#include "pv/application.hpp"
#include "pv/devicemanager.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/logging.hpp"
#include "pv/mainwindow.hpp"
#include "pv/session.hpp"
#include "pv/mainwindow.hpp"
#include "pv/session.hpp"
@@
-189,6
+191,12
@@
int main(int argc, char *argv[])
if (argc - optind == 1)
open_file = argv[argc - 1];
if (argc - optind == 1)
open_file = argv[argc - 1];
+ // Prepare the global settings since logging needs them early on
+ pv::GlobalSettings settings;
+ settings.set_defaults_where_needed();
+
+ pv::logging.init();
+
// Initialise libsigrok
context = sigrok::Context::create();
pv::Session::sr_context = context;
// Initialise libsigrok
context = sigrok::Context::create();
pv::Session::sr_context = context;