From c82eca96a6aee7faca727f0d0e8a28c8b000e0c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 1 Apr 2008 14:01:14 +0000 Subject: [PATCH] configure.ac: Require GLib 2.12 and liboil 0.3.14. Original commit message from CVS: * configure.ac: Require GLib 2.12 and liboil 0.3.14. * gst/volume/gstvolume.c: (volume_process_double): Unconditionally use liboil 0.3.14 function. --- ChangeLog | 8 ++++++++ common | 2 +- configure.ac | 6 +++--- gst/volume/gstvolume.c | 8 -------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe6a919..c8de978 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-01 Sebastian Dröge + + * configure.ac: + Require GLib 2.12 and liboil 0.3.14. + + * gst/volume/gstvolume.c: (volume_process_double): + Unconditionally use liboil 0.3.14 function. + 2008-03-31 Wim Taymans * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): diff --git a/common b/common index 4221e9d..5421815 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4221e9dcb05faa6f6f7ba19bba32fe90da4577dd +Subproject commit 5421815aeed8b2d73a4d4d4a4b8eb2c93f1b7d02 diff --git a/configure.ac b/configure.ac index 0de0844..901846a 100644 --- a/configure.ac +++ b/configure.ac @@ -242,12 +242,12 @@ AG_GST_CHECK_FUNCTION dnl *** checks for dependency libraries *** dnl GLib is required -AG_GST_GLIB_CHECK([2.6]) +AG_GST_GLIB_CHECK([2.12]) dnl liboil is required -PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.8, HAVE_LIBOIL=yes, HAVE_LIBOIL=no) +PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.14, HAVE_LIBOIL=yes, HAVE_LIBOIL=no) if test "x$HAVE_LIBOIL" != "xyes"; then - AC_ERROR([liboil-0.3.8 or later is required]) + AC_ERROR([liboil-0.3.14 or later is required]) fi dnl checks for gstreamer diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c index bf32d18..0ad23b1 100644 --- a/gst/volume/gstvolume.c +++ b/gst/volume/gstvolume.c @@ -457,17 +457,9 @@ volume_process_double (GstVolume * this, gpointer bytes, guint n_bytes) gdouble *data = (gdouble *) bytes; guint num_samples = n_bytes / sizeof (gdouble); -#ifdef oil_scalarmultiply_f64_ns gdouble vol = this->real_vol_f; oil_scalarmultiply_f64_ns (data, data, &vol, num_samples); -#else - gint i; - - for (i = 0; i < num_samples; i++) { - *data++ *= this->real_vol_f; - } -#endif } static void -- 2.7.4