[banshee: 5/6] Merge git://people.freedesktop.org/~slomo/banshee into master

[Bertrand Lorentz <blorentz src gnome org>]

commit a9952f57232cfedf730caa106170e7ca331927dd
Merge: 0f2815d c6ea982
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Thu Oct 10 21:51:09 2013 +0200

    Merge git://people.freedesktop.org/~slomo/banshee into master
    
    Conflicts:
        configure.ac

 build/m4/banshee/gstreamer.m4                      |   19 ++--
 configure.ac                                       |   15 ----
 data/audio-profiles/wav.xml.in                     |    7 +-
 libbanshee/Makefile.am                             |    4 -
 libbanshee/banshee-bpmdetector.c                   |   19 ++--
 libbanshee/banshee-gst.h                           |    4 +-
 libbanshee/banshee-player-cdda.c                   |    5 +-
 libbanshee/banshee-player-dvd.c                    |    4 +-
 libbanshee/banshee-player-equalizer.c              |    4 +-
 libbanshee/banshee-player-missing-elements.c       |    2 +-
 libbanshee/banshee-player-pipeline.c               |   41 ++++-----
 libbanshee/banshee-player-private.h                |   13 ++-
 libbanshee/banshee-player-replaygain.c             |   29 +++----
 libbanshee/banshee-player-video.c                  |   89 ++++++++++----------
 libbanshee/banshee-player-vis.c                    |   88 ++++++-------------
 libbanshee/banshee-player.c                        |   21 +----
 libbanshee/banshee-ripper.c                        |   16 ++--
 libbanshee/banshee-tagger.c                        |    2 +-
 libbanshee/banshee-transcoder.c                    |   27 +++---
 .../Banshee.GStreamer/PlayerEngine.cs              |   32 ++-----
 src/Backends/Banshee.GStreamer/Makefile.am         |    4 -
 src/Backends/Banshee.GStreamerSharp/Makefile.am    |    4 -
 22 files changed, 175 insertions(+), 274 deletions(-)
---
diff --cc configure.ac
index 6c91fb9,b116764..02cb201
--- a/configure.ac
+++ b/configure.ac
@@@ -167,24 -174,6 +167,9 @@@ BANSHEE_CHECK_SOUNDMEN
  dnl Ubuntu One Music Store (optional)
  BANSHEE_CHECK_UBUNTUONE
  
 +dnl Boo (optional)
 +BANSHEE_CHECK_BOO
 +
- dnl Gapless, if we have a new-enough playbin2
- ENABLE_GAPLESS="no"
- AC_ARG_ENABLE(gapless-playback,
-       AC_HELP_STRING([--enable-gapless-playback],
-               [Enable gapless playback engine (requires gst-plugins-base > 0.10.25.2)]),
-               enable_gapless=$enableval,
-               enable_gapless=auto)
- if test "x$enable_gapless" != "xno" ; then
-       PKG_CHECK_MODULES([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10 > 0.10.25.2], ENABLE_GAPLESS=yes, 
ENABLE_GAPLESS=no)
-       if test "x$enable_gapless" == "xyes" -a "x$ENABLE_GAPLESS" == "xno" ; then
-               AC_MSG_ERROR([Gapless playback requires gstreamer-plugins-base > 0.10.25.2])
-       fi
- fi
- AM_CONDITIONAL(ENABLE_GAPLESS, test "x$ENABLE_GAPLESS" = "xyes")   
- 
  dnl i18n
  SHAMROCK_CONFIGURE_I18N($PACKAGE)