|
 |
c724e24 |
From cd63c194ca34f8508001349f94bd430ec160f6de Mon Sep 17 00:00:00 2001
|
|
 |
deef3c3 |
From: Haikel Guemar <hguemar@fedoraproject.org>
|
|
|
deef3c3 |
Date: Fri, 10 Jun 2016 14:22:24 +0200
|
|
|
c724e24 |
Subject: [PATCH 1/2] Migrate to Gstreamermm 1.0 API
|
|
|
deef3c3 |
|
|
|
deef3c3 |
---
|
|
|
deef3c3 |
configure.ac | 2 +-
|
|
|
deef3c3 |
src/snd.cpp | 9 +++++----
|
|
|
deef3c3 |
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
deef3c3 |
|
|
|
deef3c3 |
diff --git a/configure.ac b/configure.ac
|
|
|
c724e24 |
index 6824627..7525a4b 100644
|
|
|
deef3c3 |
--- a/configure.ac
|
|
|
deef3c3 |
+++ b/configure.ac
|
|
|
deef3c3 |
@@ -95,7 +95,7 @@ AC_ARG_ENABLE(sound, [ --enable-sound Enable or disable sound usage (de
|
|
|
deef3c3 |
use_sound="$enableval", use_sound="yes")
|
|
|
deef3c3 |
|
|
|
deef3c3 |
if test $use_sound = yes; then
|
|
|
deef3c3 |
-PKG_CHECK_MODULES(GSTREAMER, gstreamermm-0.10)
|
|
|
deef3c3 |
+PKG_CHECK_MODULES(GSTREAMER, gstreamermm-1.0)
|
|
|
deef3c3 |
AC_SUBST(GSTREAMER_CFLAGS)
|
|
|
deef3c3 |
AC_SUBST(GSTREAMER_LIBS)
|
|
|
deef3c3 |
AC_DEFINE([LW_SOUND], 1, [enables sound])
|
|
|
deef3c3 |
diff --git a/src/snd.cpp b/src/snd.cpp
|
|
|
c724e24 |
index 1c97dad..bb1d049 100644
|
|
|
deef3c3 |
--- a/src/snd.cpp
|
|
|
deef3c3 |
+++ b/src/snd.cpp
|
|
|
deef3c3 |
@@ -32,6 +32,7 @@
|
|
|
deef3c3 |
|
|
|
deef3c3 |
#ifdef LW_SOUND
|
|
|
deef3c3 |
#include <gstreamermm.h>
|
|
|
deef3c3 |
+#include <gstreamermm/playbin.h>
|
|
|
deef3c3 |
#endif
|
|
|
deef3c3 |
|
|
|
deef3c3 |
//#define debug(x) {std::cerr<<__FILE__<<": "<<__LINE__<<": "<
|
|
|
deef3c3 |
@@ -41,8 +42,8 @@ struct Snd::Impl
|
|
|
deef3c3 |
{
|
|
|
deef3c3 |
#ifdef LW_SOUND
|
|
|
deef3c3 |
// currently playing background and foreground piece
|
|
|
deef3c3 |
- Glib::RefPtr<Gst::PlayBin2> back;
|
|
|
deef3c3 |
- Glib::RefPtr<Gst::PlayBin2> effect;
|
|
|
deef3c3 |
+ Glib::RefPtr<Gst::PlayBin> back;
|
|
|
deef3c3 |
+ Glib::RefPtr<Gst::PlayBin> effect;
|
|
|
deef3c3 |
#endif
|
|
|
deef3c3 |
int placeholder;
|
|
|
deef3c3 |
};
|
|
|
deef3c3 |
@@ -83,8 +84,8 @@ Snd::Snd()
|
|
|
deef3c3 |
helper.close();
|
|
|
deef3c3 |
|
|
|
deef3c3 |
#ifdef LW_SOUND
|
|
|
deef3c3 |
- impl->back = Gst::PlayBin2::create();
|
|
|
deef3c3 |
- impl->effect = Gst::PlayBin2::create();
|
|
|
deef3c3 |
+ impl->back = Gst::PlayBin::create();
|
|
|
deef3c3 |
+ impl->effect = Gst::PlayBin::create();
|
|
|
deef3c3 |
impl->effect->get_bus()->add_watch(sigc::bind(sigc::hide<0>(sigc::mem_fun(*this, &Snd::on_bus_message)), 0));
|
|
|
deef3c3 |
impl->back->get_bus()->add_watch(sigc::bind(sigc::hide<0>(sigc::mem_fun(*this, &Snd::on_bus_message)), 1));
|
|
|
deef3c3 |
#endif
|
|
|
deef3c3 |
--
|
|
|
c724e24 |
2.14.3
|
|
|
deef3c3 |
|