]> sigrok.org Git - pulseview.git/commitdiff
Add new dependency: libgstreamermm >= 1.8.0.
authorUwe Hermann <redacted>
Fri, 28 Dec 2018 18:10:41 +0000 (19:10 +0100)
committerUwe Hermann <redacted>
Sat, 29 Dec 2018 16:11:47 +0000 (17:11 +0100)
Also, initialize gstreamermm in main().

CMakeLists.txt
INSTALL
main.cpp

index b6f25e2742314533e43fb35c1130f91c4d475b4f..bef88ecbf5143e8af3d5aa413999748e5a45b440 100644 (file)
@@ -74,6 +74,7 @@ add_subdirectory(manual)
 
 list(APPEND PKGDEPS glib-2.0>=2.28.0)
 list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)
 
 set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1")
 list(APPEND PKGDEPS "${LIBSR_CXX_BINDING}")
diff --git a/INSTALL b/INSTALL
index edb7940d522c9126e1edcbf8579e1d54fd2762f7..c68d575d4d8277f8c8dec2d9f1ec8967ff31bce2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -15,6 +15,7 @@ Requirements
  - cmake >= 2.8.12
  - libglib >= 2.28.0
  - glibmm-2.4 (>= 2.28.0)
+ - gstreamermm-1.0 (>= 1.8.0)
  - Qt5 (including the following components):
     - Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg
  - libboost >= 1.55 (including the following libs):
index a77969ea7f72313e6c42b71cf0cd09980c53e0da..fca9aa7966e5b8f7f8be420ef1260953a7860b98 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -26,6 +26,8 @@
 #include <getopt.h>
 #include <vector>
 
+#include <gstreamermm.h>
+
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <QCheckBox>
@@ -169,6 +171,9 @@ int main(int argc, char *argv[])
        bool do_scan = true;
        bool show_version = false;
 
+       // Initialise gstreamermm. Must be called before any other GLib stuff.
+       Gst::init();
+
        Application a(argc, argv);
 
 #ifdef ANDROID