OG_MULTIARG_WITH([sound], [dnl
AS_HELP_STRING([--with-sound=TYPE],
[Compile with sound support.])],
- [auto], [Autodetect all sound support (except Pulse)], [dnl
+ [auto], [Autodetect all sound support], [dnl
OG_MULTIARG_ITEM([alsa], [ALSA], [kernel-based linux sound standard])
OG_MULTIARG_ITEM([ao], [ao], [generic audio output layer])
OG_MULTIARG_ITEM([esd], [ESD], [Enlightenment Sound Daemon])
OG_MULTIARG_ITEM([jack], [Jack], [a low-latency audio server])
OG_MULTIARG_ITEM([nas], [NAS], [Network Audio System])
OG_MULTIARG_ITEM([oss], [OSS], [Open Sound System])
+ OG_MULTIARG_ITEM([pulse], [PulseAudio], [PulseAudio Sound Server])
])
-OG_ARG_WITH([pulseaudio],
- AS_HELP_STRING([--with-pulseaudio],
- [Compile with support for the PulseAudio audio server.
- This has been turned off by default because of too many
- bugs in recent versions of PA. Use at your own risk,
- YMMV, and all that.]),
- [no], [NO])
-
OG_MULTIARG_WITH([media], [dnl
AS_HELP_STRING([--with-media=TYPE],
[Compile with media stream support.])],
fi
dnl PulseAudio Sound support
-if test "$with_pulseaudio" != "no"; then
+if test "$with_sound_pulse" != "no"; then
SXE_MM_CHECK_PULSE([have_sound_pulse=yes], [have_sound_pulse=no])
AC_MSG_CHECKING([for sufficient PulseAudio support])
if test "$have_sound_pulse" = "yes"; then
AC_MSG_RESULT([yes])
- PULSEAUDIO_LIBS=`$PKG_CONFIG --libs libpulse`
- pulse_version=`$PKG_CONFIG --modversion libpulse`
- pulse_major_version=0
- pulse_minor_version=`echo $pulse_version | \
- sed -e "s/0\.\([[0-9]]*\).*/\1/"`
need_internal_media=yes
SXE_ADD_MM_OBJS([sound-pulse.o])
- SXE_PREPEND($PULSEAUDIO_LIBS, MM_LIBS)
+ SXE_PREPEND($PULSE_LIBS, MM_LIBS)
+ SXE_PREPEND_UNDUP($PULSE_CFLAGS, MM_CPPFLAGS)
AC_DEFINE([HAVE_PULSE_SOUND], [1],
[Whether to put in support for PulseAudio.])
- AC_DEFINE_UNQUOTED([PULSE_VERSION], [$pulse_minor_version],
- [Version of the underlying pulse lib.])
else
AC_MSG_RESULT(no)
have_sound_pulse=no
## arg #1: action on success
## arg #2: action on failure
- PULSE_REQUIRED_VERSION=0.9.3
- _SXE_MM_CHECK_pkgconfig_based(dnl
- [pulse], [libpulse], [$PULSE_REQUIRED_VERSION], [dnl
- pa_mainloop_new pa_threaded_mainloop_new pa_mainloop_iterate dnl
- pa_threaded_mainloop_lock pa_threaded_mainloop_unlock dnl
- pa_mainloop_get_api pa_threaded_mainloop_get_api dnl
- pa_mainloop_free pa_threaded_mainloop_free dnl
- pa_threaded_mainloop_stop dnl
- pa_context_new pa_context_get_state pa_context_is_pending dnl
- pa_context_disconnect dnl
- pa_operation_unref dnl
- pa_stream_new pa_stream_get_state pa_stream_write dnl
- pa_stream_set_state_callback pa_stream_set_write_callback dnl
- pa_stream_unref pa_stream_connect_playback pa_stream_disconnect dnl
- pa_stream_cork],
- [pulse/pulseaudio.h], [$1], [$2])
+ PKG_CHECK_MODULES([PULSE], [libpulse >= 2.0.0], [$1], [$2])
])dnl SXE_MM_CHECK_PULSE
AC_DEFUN([SXE_MM_CHECK_JACK], [
{
audio_job_t aj = NULL;
media_substream *mss = NULL;
- int resolution, channels;
+ int resolution __attribute__((unused));
+ int channels;
media_thread_play_state mtp;
- size_t len, tmplen, real_frm_sz;
+ size_t len, tmplen;
+ size_t real_frm_sz __attribute__((unused));
long int i;
/* pulse and subthread stuff */
sound_pulse_aj_data_t spsd;
- pa_context *ctx = NULL;
+ pa_context *ctx __attribute__((unused)) = NULL;
sxe_media_sample_t *tmpbuf;
assert(stream && length);