From f4effd0b2e094250521712a2ec8d5ac1a2ed6b75 Mon Sep 17 00:00:00 2001 From: Ben Asselstine Date: Mon, 13 Mar 2017 07:44:43 -0400 Subject: [PATCH] added patch to migrate from gstreamermm-0.10 to gstreamermm-1.0 (bug #45472) --- configure.ac | 2 +- src/snd.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 5afb1a1..6d1b4a4 100644 --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,7 @@ AC_ARG_ENABLE(sound, [ --enable-sound Enable or disable sound usage (de use_sound="$enableval", use_sound="yes") if test $use_sound = yes; then -PKG_CHECK_MODULES(GSTREAMER, gstreamermm-0.10) +PKG_CHECK_MODULES(GSTREAMER, gstreamermm-1.0) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) AC_DEFINE([LW_SOUND], 1, [enables sound]) diff --git a/src/snd.cpp b/src/snd.cpp index 1c97dad..bb1d049 100644 --- a/src/snd.cpp +++ b/src/snd.cpp @@ -32,6 +32,7 @@ #ifdef LW_SOUND #include +#include #endif //#define debug(x) {std::cerr<<__FILE__<<": "<<__LINE__<<": "< back; - Glib::RefPtr effect; + Glib::RefPtr back; + Glib::RefPtr effect; #endif int placeholder; }; @@ -83,8 +84,8 @@ Snd::Snd() helper.close(); #ifdef LW_SOUND - impl->back = Gst::PlayBin2::create(); - impl->effect = Gst::PlayBin2::create(); + impl->back = Gst::PlayBin::create(); + impl->effect = Gst::PlayBin::create(); impl->effect->get_bus()->add_watch(sigc::bind(sigc::hide<0>(sigc::mem_fun(*this, &Snd::on_bus_message)), 0)); impl->back->get_bus()->add_watch(sigc::bind(sigc::hide<0>(sigc::mem_fun(*this, &Snd::on_bus_message)), 1)); #endif -- 2.10.4