Merge branch 'master' of github.com:thestk/stk

This commit is contained in:
Gary Scavone
2022-04-22 16:28:32 -04:00
2 changed files with 9 additions and 1 deletions

View File

@@ -162,6 +162,14 @@ api="$api -D__UNIX_JACK__"
AC_MSG_RESULT(using ALSA)
AC_CHECK_LIB(asound, snd_pcm_open, , AC_MSG_ERROR(ALSA support requires the asound library!))])
# Look for PulseAudio flag
AC_ARG_WITH(pulse, [ --with-pulse = choose PulseAudio support (linux only)])
AS_IF([test "x$with_pulse" == "xyes"], [
api="$api -D__LINUX_PULSE__"
AC_MSG_RESULT(using PulseAudio)
AC_CHECK_LIB(pulse, pa_proplist_gets, , AC_MSG_ERROR(PulseAudio support requires the libpulse library!))
AC_CHECK_LIB(pulse-simple, pa_simple_new, , AC_MSG_ERROR(PulseAudio support requires the libpulse-simple library!))])
# Look for OSS flag
AC_ARG_WITH(oss, [ --with-oss = choose OSS API support (unixes only)])
AS_IF([test "x$with_oss" == "xyes"], [

View File

@@ -622,7 +622,7 @@ const StkFloat ONE_OVER_128 = 0.0078125;
#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__WINDOWS_MM__)
#define __OS_WINDOWS__
#define __STK_REALTIME__
#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__)
#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__) || defined(__LINUX_PULSE__)
#define __OS_LINUX__
#define __STK_REALTIME__
#elif defined(__IRIX_AL__)