[Spice-devel] [PATCH spice-gtk 1/2] configure: Try gstreamer audio backend if pulse is not available

[Marc-André Lureau]

The cascaded if could be simpler imho, by backend priority
if auto & have pulse: pulse
if auto & have gst: gst
if auto: no

some day, hopefully, we will have only one backend :)

On Fri, Jun 12, 2015 at 12:24 PM, Pavel Grunt <pgrunt at redhat.com> wrote:

> ---
>  configure.ac | 23 +++++++++++------------
>  1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 1d8f4d0..1156856 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -296,19 +296,22 @@ AC_ARG_WITH([audio],
>    [],
>    [with_audio="auto"])
>
> -AS_IF([test "x$with_audio" = "xauto"], [
> -  AS_IF([test "x$os_win32" = "xyes"], [with_audio=gstreamer],
> [with_audio=pulse])
> -])
> -
>  case "$with_audio" in
> -  gstreamer|pulse|no*)
> +  gstreamer|pulse|auto*)
> +    PKG_CHECK_MODULES(GST, gstreamer-1.0 gstreamer-base-1.0
> gstreamer-app-1.0 gstreamer-audio-1.0, [have_gst=yes], [have_gst=no])
> +    PKG_CHECK_MODULES(PULSE, libpulse libpulse-mainloop-glib,
> [have_pulse=yes], [have_pulse=no])
> +    ;;
> +  no*)
>      ;;
>    *) AC_MSG_ERROR(Unsupported audio backend)
>  esac
>
> -AS_IF([test "x$with_audio" = "xpulse"],
> -      [PKG_CHECK_MODULES(PULSE, libpulse libpulse-mainloop-glib,
> [have_pulse=yes], [have_pulse=no])],
> -      [have_pulse=no])
> +AS_IF([test "x$with_audio" = "xauto"],
> +      [AS_IF([test "x$os_win32" = "xyes"],
> +             [with_audio=gstreamer],
> +             [AS_IF([test "x$have_pulse" = "xyes"],
> +                    [with_audio=pulse],
> +                    [with_audio=gstreamer])])])
>
>  AS_IF([test "x$have_pulse" = "xyes"],
>        [AC_DEFINE([WITH_PULSE], 1, [Have pulseaudio?])],
> @@ -320,10 +323,6 @@ AM_CONDITIONAL([WITH_PULSE], [test "x$have_pulse" =
> "xyes"])
>  AC_SUBST(PULSE_CFLAGS)
>  AC_SUBST(PULSE_LIBS)
>
> -AS_IF([test "x$with_audio" = "xgstreamer"],
> -      [PKG_CHECK_MODULES(GST, gstreamer-1.0 gstreamer-base-1.0
> gstreamer-app-1.0 gstreamer-audio-1.0, [have_gst=yes], [have_gst=no])],
> -      [have_gst=no])
> -
>  AS_IF([test "x$have_gst" = "xyes"],
>        [AC_DEFINE([WITH_GSTAUDIO], 1, [Have GStreamer 1.0?])],
>        [AS_IF([test "x$with_audio" = "xgstreamer"],
> --
> 2.4.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>



-- 
Marc-André Lureau
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150615/9565ad6b/attachment.html>