X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=a4c7e72badfd6fb4fca88e3cf559d47c5a4586da;hp=455d7afd3d2b7e49f182da829437b0d459f785df;hb=045d81160abe3e545fc44e3b4246b9ed336a7841;hpb=f4ab4b5c657e5613caba82feaa81a8a400e4f331

diff --git a/main.cpp b/main.cpp
index 455d7afd..a4c7e72b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,6 +26,11 @@
 #include <getopt.h>
 #include <vector>
 
+#ifdef ENABLE_GSTREAMERMM
+#include <gstreamermm.h>
+#include <libsigrokflow/libsigrokflow.hpp>
+#endif
+
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <QCheckBox>
@@ -54,6 +59,7 @@
 #include "pv/logging.hpp"
 #include "pv/mainwindow.hpp"
 #include "pv/session.hpp"
+#include "pv/util.hpp"
 
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
@@ -168,6 +174,11 @@ int main(int argc, char *argv[])
 	bool do_scan = true;
 	bool show_version = false;
 
+#ifdef ENABLE_GSTREAMERMM
+	// Initialise gstreamermm. Must be called before any other GLib stuff.
+	Gst::init();
+#endif
+
 	Application a(argc, argv);
 
 #ifdef ANDROID
@@ -254,9 +265,12 @@ int main(int argc, char *argv[])
 	for (int i = 0; i < argc; i++)
 		open_files.emplace_back(argv[i]);
 
+	qRegisterMetaType<pv::util::Timestamp>("util::Timestamp");
+	qRegisterMetaType<uint64_t>("uint64_t");
+
 	// Prepare the global settings since logging needs them early on
 	pv::GlobalSettings settings;
-	settings.save_default_palette();
+	settings.save_internal_defaults();
 	settings.set_defaults_where_needed();
 	settings.apply_theme();