We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch for JACK support in SDL

jackv1.patch (text/plain), 27.17 KB, created by le.businessman on 2013-10-19 03:39:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: le.businessman

Created: 2013-10-19 03:39:33 UTC

Size: 27.17 KB

patch

obsolete

>diff -r 73da2747c268 -r cd4698a9687b CMakeLists.txt
>--- a/CMakeLists.txt	Sat Oct 12 11:21:40 2013 -0400
>+++ b/CMakeLists.txt	Fri Oct 18 23:26:13 2013 -0400
>@@ -208,6 +208,8 @@
> dep_option(ESD_SHARED          "Dynamically load ESD audio support" ON "ESD" OFF)
> set_option(PULSEAUDIO          "Use PulseAudio" ${UNIX_SYS})
> dep_option(PULSEAUDIO_SHARED   "Dynamically load PulseAudio support" ON "PULSEAUDIO" OFF)
>+set_option(JACK          	   "Use Jack Audio Connection Kit" ${UNIX_SYS})
>+dep_option(JACK_SHARED         "Dynamically load Jack Audio Connection Kit support" ON "JACK" OFF)
> set_option(ARTS                "Support the Analog Real Time Synthesizer" ${UNIX_SYS})
> dep_option(ARTS_SHARED         "Dynamically load aRts audio support" ON "ARTS" OFF)
> set_option(NAS                 "Support the NAS audio API" ${UNIX_SYS})
>@@ -627,6 +629,7 @@
>     CheckOSS()
>     CheckALSA()
>     CheckPulseAudio()
>+    CheckJACK()
>     CheckESD()
>     CheckARTS()
>     CheckNAS()
>diff -r 73da2747c268 -r cd4698a9687b cmake/sdlchecks.cmake
>--- a/cmake/sdlchecks.cmake	Sat Oct 12 11:21:40 2013 -0400
>+++ b/cmake/sdlchecks.cmake	Fri Oct 18 23:26:13 2013 -0400
>@@ -130,6 +130,37 @@
> # Requires:
> # - PkgCheckModules
> # Optional:
>+# - JACK_SHARED opt
>+# - HAVE_DLOPEN opt
>+macro(CheckJACK)
>+  if(JACK)
>+    pkg_check_modules(PKG_JACK jack)
>+    if(PKG_JACK_FOUND)
>+      set(HAVE_JACK TRUE)
>+      file(GLOB JACK_SOURCES ${SDL2_SOURCE_DIR}/src/audio/jack/*.c)
>+      set(SOURCE_FILES ${SOURCE_FILES} ${JACK_SOURCES})
>+      set(SDL_AUDIO_DRIVER_JACK 1)
>+      list(APPEND EXTRA_CFLAGS ${PKG_JACK_CFLAGS})
>+      if(JACK_SHARED)
>+        if(NOT HAVE_DLOPEN)
>+          message_warn("You must have SDL_LoadObject() support for dynamic JACK loading")
>+        else()
>+          find_library(D_JACK_LIB jack)
>+          get_filename_component(F_JACK_LIB ${D_JACK_LIB} NAME)
>+          set(SDL_AUDIO_DRIVER_JACK_DYNAMIC "\"${F_JACK_LIB}\"")
>+          set(HAVE_JACK_SHARED TRUE)
>+        endif(NOT HAVE_DLOPEN)
>+      else(JACK_SHARED)
>+        list(APPEND EXTRA_LDFLAGS ${PKG_JACK_LDFLAGS})
>+      endif(JACK_SHARED)
>+      set(HAVE_SDL_AUDIO TRUE)
>+    endif(PKG_JACK_FOUND)
>+  endif(JACK)
>+endmacro(CheckJACK)
>+
>+# Requires:
>+# - PkgCheckModules
>+# Optional:
> # - ESD_SHARED opt
> # - HAVE_DLOPEN opt
> macro(CheckESD)
>diff -r 73da2747c268 -r cd4698a9687b configure
>--- a/configure	Sat Oct 12 11:21:40 2013 -0400
>+++ b/configure	Fri Oct 18 23:26:13 2013 -0400
>@@ -807,6 +807,8 @@
> with_esd_exec_prefix
> enable_esdtest
> enable_esd_shared
>+enable_jack
>+enable_jack_shared
> enable_pulseaudio
> enable_pulseaudio_shared
> enable_arts
>@@ -1520,6 +1522,8 @@
>   --enable-esd            support the Enlightened Sound Daemon [[default=yes]]
>   --disable-esdtest       Do not try to compile and run a test ESD program
>   --enable-esd-shared     dynamically load ESD audio support [[default=yes]]
>+  --enable-jack           use jack [[default=yes]]
>+  --enable-jack-shared    dynamically load jack support [[default=yes]]
>   --enable-pulseaudio     use PulseAudio [[default=yes]]
>   --enable-pulseaudio-shared
>                           dynamically load PulseAudio support [[default=yes]]
>@@ -17714,6 +17718,7 @@
>     fi
> }
> 
>+
> CheckESD()
> {
>     # Check whether --enable-esd was given.
>@@ -17997,6 +18002,117 @@
>     fi
> }
> 
>+CheckJACK()
>+{
>+    # Check whether --enable-jack was given.
>+if test "${enable_jack+set}" = set; then :
>+  enableval=$enable_jack;
>+else
>+  enable_jack=yes
>+fi
>+
>+    if test x$enable_audio = xyes -a x$enable_jack = xyes; then
>+        audio_jack=no
>+
>+        JACK_REQUIRED_VERSION=0.50.0
>+
>+        # Extract the first word of "pkg-config", so it can be a program name with args.
>+set dummy pkg-config; ac_word=$2
>+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
>+$as_echo_n "checking for $ac_word... " >&6; }
>+if ${ac_cv_path_PKG_CONFIG+:} false; then :
>+  $as_echo_n "(cached) " >&6
>+else
>+  case $PKG_CONFIG in
>+  [\\/]* | ?:[\\/]*)
>+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
>+  ;;
>+  *)
>+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
>+for as_dir in $PATH
>+do
>+  IFS=$as_save_IFS
>+  test -z "$as_dir" && as_dir=.
>+    for ac_exec_ext in '' $ac_executable_extensions; do
>+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
>+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
>+    break 2
>+  fi
>+done
>+  done
>+IFS=$as_save_IFS
>+
>+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
>+  ;;
>+esac
>+fi
>+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
>+if test -n "$PKG_CONFIG"; then
>+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
>+$as_echo "$PKG_CONFIG" >&6; }
>+else
>+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+$as_echo "no" >&6; }
>+fi
>+
>+
>+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack $JACK_REQUIRED_VERSION support" >&5
>+$as_echo_n "checking for jack $JACK_REQUIRED_VERSION support... " >&6; }
>+        if test x$PKG_CONFIG != xno; then
>+        if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $JACK_REQUIRED_VERSION jack; then
>+                JACK_CFLAGS=`$PKG_CONFIG --cflags jack`
>+                JACK_LIBS=`$PKG_CONFIG --libs jack`
>+                audio_jack=yes
>+            fi
>+        fi
>+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $audio_jack" >&5
>+$as_echo "$audio_jack" >&6; }
>+
>+        if test x$audio_jack = xyes; then
>+            # Check whether --enable-jack-shared was given.
>+if test "${enable_jack_shared+set}" = set; then :
>+  enableval=$enable_jack_shared;
>+else
>+  enable_jack_shared=yes
>+fi
>+
>+            jack_lib=`find_lib "libjack.so.*" "$JACK_LIBS" | sed 's/.*\/$.*$/\1/; q'`
>+
>+
>+$as_echo "#define SDL_AUDIO_DRIVER_JACK 1" >>confdefs.h
>+
>+            SOURCES="$SOURCES $srcdir/src/audio/jack/*.c"
>+            EXTRA_CFLAGS="$EXTRA_CFLAGS $JACK_CFLAGS"
>+            if test x$have_loadso != xyes && \
>+               test x$enable_jack_shared = xyes; then
>+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You must have SDL_LoadObject() support for dynamic JACK loading" >&5
>+$as_echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic JACK loading" >&2;}
>+            fi
>+            if test x$have_loadso = xyes && \
>+               test x$enable_jack_shared = xyes && test x$jack_lib != x; then
>+                echo "-- dynamic jack -> $jack_lib"
>+
>+cat >>confdefs.h <<_ACEOF
>+#define SDL_AUDIO_DRIVER_JACK_DYNAMIC "$jack_lib"
>+_ACEOF
>+
>+
>+                case "$host" in
>+                    # On Solaris, pulseaudio must be linked deferred explicitly
>+                    # to prevent undefined symbol failures.
>+                    *-*-solaris*)
>+                        JACK_LIBS=`echo $JACK_LIBS | sed 's/\-l/-Wl,-l/g'`
>+                        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-zdeferred $JACK_LIBS -Wl,-znodeferred"
>+                esac
>+            else
>+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $JACK_LIBS"
>+            fi
>+            have_audio=yes
>+        fi
>+    fi
>+}
>+
> CheckPulseAudio()
> {
>     # Check whether --enable-pulseaudio was given.
>@@ -22107,6 +22223,7 @@
>         CheckOSS
>         CheckALSA
>         CheckPulseAudio
>+        CheckJACK
>         CheckARTSC
>         CheckESD
>         CheckNAS
>diff -r 73da2747c268 -r cd4698a9687b configure.in
>--- a/configure.in	Sat Oct 12 11:21:40 2013 -0400
>+++ b/configure.in	Fri Oct 18 23:26:13 2013 -0400
>@@ -762,6 +762,7 @@
>     fi
> }
> 
>+
> dnl Find the ESD includes and libraries
> CheckESD()
> {
>@@ -795,6 +796,61 @@
>     fi
> }
> 
>+dnl Find JACK
>+CheckJACK()
>+{
>+    AC_ARG_ENABLE(jack,
>+AC_HELP_STRING([--enable-jack], [use jack [[default=yes]]]),
>+                  , enable_jack=yes)
>+    if test x$enable_audio = xyes -a x$enable_jack = xyes; then
>+        audio_jack=no
>+
>+        JACK_REQUIRED_VERSION=0.50.0
>+
>+        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
>+        AC_MSG_CHECKING(for jack $JACK_REQUIRED_VERSION support)
>+        if test x$PKG_CONFIG != xno; then
>+        if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $JACK_REQUIRED_VERSION jack; then
>+                JACK_CFLAGS=`$PKG_CONFIG --cflags jack`
>+                JACK_LIBS=`$PKG_CONFIG --libs jack`
>+                audio_jack=yes
>+            fi
>+        fi
>+        AC_MSG_RESULT($audio_jack)
>+
>+        if test x$audio_jack = xyes; then
>+            AC_ARG_ENABLE(jack-shared,
>+AC_HELP_STRING([--enable-jack-shared], [dynamically load jack support [[default=yes]]]),
>+                          , enable_jack_shared=yes)
>+            jack_lib=[`find_lib "libjack.so.*" "$JACK_LIBS" | sed 's/.*\/$.*$/\1/; q'`]
>+
>+            AC_DEFINE(SDL_AUDIO_DRIVER_JACK, 1, [ ])
>+            SOURCES="$SOURCES $srcdir/src/audio/jack/*.c"
>+            EXTRA_CFLAGS="$EXTRA_CFLAGS $JACK_CFLAGS"
>+            if test x$have_loadso != xyes && \
>+               test x$enable_jack_shared = xyes; then
>+                AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic JACK loading])
>+            fi
>+            if test x$have_loadso = xyes && \
>+               test x$enable_jack_shared = xyes && test x$jack_lib != x; then
>+                echo "-- dynamic jack -> $jack_lib"
>+                AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_JACK_DYNAMIC, "$jack_lib", [ ])
>+
>+                case "$host" in
>+                    # On Solaris, jack must be linked deferred explicitly
>+                    # to prevent undefined symbol failures.
>+                    *-*-solaris*)
>+                        JACK_LIBS=`echo $JACK_LIBS | sed 's/\-l/-Wl,-l/g'`
>+                        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-zdeferred $JACK_LIBS -Wl,-znodeferred"
>+                esac
>+            else
>+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $JACK_LIBS"
>+            fi
>+            have_audio=yes
>+        fi
>+    fi
>+}
>+
> dnl Find PulseAudio
> CheckPulseAudio()
> {
>@@ -2405,6 +2461,7 @@
>         CheckOSS
>         CheckALSA
>         CheckPulseAudio
>+        CheckJACK
>         CheckARTSC
>         CheckESD
>         CheckNAS
>diff -r 73da2747c268 -r cd4698a9687b include/SDL_config.h.in
>--- a/include/SDL_config.h.in	Sat Oct 12 11:21:40 2013 -0400
>+++ b/include/SDL_config.h.in	Fri Oct 18 23:26:13 2013 -0400
>@@ -193,6 +193,8 @@
> #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
> #undef SDL_AUDIO_DRIVER_PULSEAUDIO
> #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
>+#undef SDL_AUDIO_DRIVER_JACK
>+#undef SDL_AUDIO_DRIVER_JACK_DYNAMIC
> #undef SDL_AUDIO_DRIVER_BEOSAUDIO
> #undef SDL_AUDIO_DRIVER_BSD
> #undef SDL_AUDIO_DRIVER_COREAUDIO
>diff -r 73da2747c268 -r cd4698a9687b src/audio/SDL_audio.c
>--- a/src/audio/SDL_audio.c	Sat Oct 12 11:21:40 2013 -0400
>+++ b/src/audio/SDL_audio.c	Fri Oct 18 23:26:13 2013 -0400
>@@ -47,6 +47,7 @@
> extern AudioBootStrap DSP_bootstrap;
> extern AudioBootStrap ALSA_bootstrap;
> extern AudioBootStrap PULSEAUDIO_bootstrap;
>+extern AudioBootStrap JACK_bootstrap;
> extern AudioBootStrap QSAAUDIO_bootstrap;
> extern AudioBootStrap SUNAUDIO_bootstrap;
> extern AudioBootStrap ARTS_bootstrap;
>@@ -74,6 +75,9 @@
> #if SDL_AUDIO_DRIVER_PULSEAUDIO
>     &PULSEAUDIO_bootstrap,
> #endif
>+#if SDL_AUDIO_DRIVER_JACK
>+    &JACK_bootstrap,
>+#endif
> #if SDL_AUDIO_DRIVER_ALSA
>     &ALSA_bootstrap,
> #endif
>diff -r 73da2747c268 -r cd4698a9687b src/audio/jack/SDL_jackaudio.c
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/src/audio/jack/SDL_jackaudio.c	Fri Oct 18 23:26:13 2013 -0400
>@@ -0,0 +1,480 @@
>+/*
>+SDL - Simple DirectMedia Layer
>+Copyright (C) 2008 Jacob Meuser
>+Copyright (C) 2013 Tristan Matthews
>+
>+This library is free software; you can redistribute it and/or
>+modify it under the terms of the GNU Lesser General Public
>+License as published by the Free Software Foundation; either
>+version 2.1 of the License, or (at your option) any later version.
>+
>+This library is distributed in the hope that it will be useful,
>+but WITHOUT ANY WARRANTY; without even the implied warranty of
>+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>+Lesser General Public License for more details.
>+
>+You should have received a copy of the GNU Lesser General Public
>+License along with this library; if not, write to the Free Software
>+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>+
>+Jacob Meuser
>+
>+*/
>+#include "SDL_config.h"
>+
>+#if SDL_AUDIO_DRIVER_JACK
>+
>+/* Allow access to a raw mixing buffer */
>+
>+#ifdef HAVE_SIGNAL_H
>+#include <signal.h>
>+#endif
>+#include <unistd.h>
>+
>+#include "SDL_timer.h"
>+#include "SDL_audio.h"
>+#include "../SDL_audiomem.h"
>+#include "../SDL_audio_c.h"
>+#include "../SDL_audiodev_c.h"
>+#include "SDL_jackaudio.h"
>+
>+#ifdef SDL_AUDIO_DRIVER_JACK_DYNAMIC
>+#include "SDL_loadso.h"
>+#endif
>+
>+/* Audio driver functions */
>+static int JACK_OpenAudio(_THIS, const char *devname, int iscapture);
>+static void JACK_PlayAudio(_THIS);
>+static void JACK_WaitAudio(_THIS);
>+static Uint8 *JACK_GetAudioBuf(_THIS);
>+static void JACK_CloseAudio(_THIS);
>+
>+static const char *client_name = "SDL";
>+static const char *server_name = "default";
>+
>+static jack_port_t * (*JACK_jack_port_register) (jack_client_t *client,
>+        const char *port_name, const char *port_type, unsigned long flags,
>+        unsigned long buffer_size);
>+
>+static jack_nframes_t (*JACK_jack_get_sample_rate) (jack_client_t *);
>+static size_t (*JACK_jack_ringbuffer_write) (jack_ringbuffer_t *,
>+        const char *, size_t);
>+static jack_nframes_t (*JACK_jack_get_buffer_size) (jack_client_t *);
>+static int (*JACK_jack_connect) (jack_client_t *, const char *, const char *);
>+static const char *(*JACK_jack_port_name) (const jack_port_t *);
>+static int (*JACK_jack_client_close) (jack_client_t *);
>+static jack_client_t *(*JACK_jack_client_open) (const char *, jack_options_t,
>+        jack_status_t *, ...);
>+static jack_ringbuffer_t *(*JACK_jack_ringbuffer_create) (size_t sz);
>+static size_t (*JACK_jack_ringbuffer_write_space) (const jack_ringbuffer_t *);
>+static int (*JACK_jack_port_unregister) (jack_client_t *, jack_port_t *);
>+static const char **(*JACK_jack_get_ports) (jack_client_t *, const char *,
>+        const char *, unsigned long);
>+static int (*JACK_jack_activate) (jack_client_t *);
>+static size_t (*JACK_jack_ringbuffer_read) (jack_ringbuffer_t *, char *, size_t);
>+static int (*JACK_jack_set_process_callback) (jack_client_t *,
>+        JackProcessCallback, void *);
>+static void * (*JACK_jack_port_get_buffer) (jack_port_t *, jack_nframes_t);
>+static void (*JACK_jack_ringbuffer_free) (jack_ringbuffer_t *);
>+
>+static int load_jack_syms(void);
>+
>+#ifdef SDL_AUDIO_DRIVER_JACK_DYNAMIC
>+
>+static const char *jack_library = SDL_AUDIO_DRIVER_JACK_DYNAMIC;
>+static void *jack_handle = NULL;
>+
>+static int
>+load_jack_sym(const char *fn, void **addr)
>+{
>+    *addr = SDL_LoadFunction(jack_handle, fn);
>+    if (*addr == NULL) {
>+        /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
>+        return 0;
>+    }
>+
>+    return 1;
>+}
>+
>+/* cast funcs to char* first, to please GCC's strict aliasing rules. */
>+#define SDL_JACK_SYM(x) \
>+    if (!load_jack_sym(#x, (void **) (char *) &JACK_##x)) return -1
>+
>+static void
>+UnloadJackLibrary(void)
>+{
>+    if (jack_handle != NULL) {
>+        SDL_UnloadObject(jack_handle);
>+        jack_handle = NULL;
>+    }
>+}
>+
>+static int
>+LoadJackLibrary(void)
>+{
>+    int retval = 0;
>+    if (jack_handle == NULL) {
>+        jack_handle = SDL_LoadObject(jack_library);
>+        if (jack_handle == NULL) {
>+            retval = -1;
>+            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
>+        } else {
>+            retval = load_jack_syms();
>+            if (retval < 0) {
>+                UnloadJackLibrary();
>+            }
>+        }
>+    }
>+    return retval;
>+}
>+
>+#else
>+
>+#define SDL_JACK_SYM(x) JACK_##x = x
>+
>+static void
>+UnloadJackLibrary(void)
>+{
>+}
>+
>+static int
>+LoadJackLibrary(void)
>+{
>+    load_jack_syms();
>+    return 0;
>+}
>+
>+#endif
>+
>+static int
>+load_jack_syms()
>+{
>+    SDL_JACK_SYM(jack_port_register);
>+    SDL_JACK_SYM(jack_get_sample_rate);
>+    SDL_JACK_SYM(jack_ringbuffer_write);
>+    SDL_JACK_SYM(jack_get_buffer_size);
>+    SDL_JACK_SYM(jack_connect);
>+    SDL_JACK_SYM(jack_port_name);
>+    SDL_JACK_SYM(jack_client_close);
>+    SDL_JACK_SYM(jack_client_open);
>+    SDL_JACK_SYM(jack_ringbuffer_create);
>+    SDL_JACK_SYM(jack_ringbuffer_write_space);
>+    SDL_JACK_SYM(jack_port_unregister);
>+    SDL_JACK_SYM(jack_get_ports);
>+    SDL_JACK_SYM(jack_activate);
>+    SDL_JACK_SYM(jack_ringbuffer_read);
>+    SDL_JACK_SYM(jack_set_process_callback);
>+    SDL_JACK_SYM(jack_port_get_buffer);
>+    SDL_JACK_SYM(jack_ringbuffer_free);
>+    return 0;
>+}
>+
>+/* Audio driver bootstrap functions */
>+
>+static int
>+CheckJackAvailable(void)
>+{
>+    jack_options_t options;
>+    jack_client_t *client;
>+    jack_status_t status;
>+    int available = 0;
>+
>+    options = JackServerName | JackNoStartServer;
>+
>+    if ((client = JACK_jack_client_open(client_name, options, &status,
>+                    server_name)) != NULL) {
>+        available = 1;
>+
>+        JACK_jack_client_close(client);
>+    }
>+
>+    return available;
>+}
>+
>+static void
>+JACK_Deinitialize()
>+{
>+    UnloadJackLibrary();
>+}
>+
>+static int
>+JACK_Init(SDL_AudioDriverImpl * impl)
>+{
>+    if (LoadJackLibrary() < 0) {
>+        return 0;
>+    }
>+
>+    if (!CheckJackAvailable()) {
>+        UnloadJackLibrary();
>+        return 0;
>+    }
>+
>+    /* Set the function pointers */
>+
>+    impl->OpenDevice = JACK_OpenAudio;
>+    impl->PlayDevice = JACK_PlayAudio;
>+    impl->WaitDevice = JACK_WaitAudio;
>+    impl->GetDeviceBuf = JACK_GetAudioBuf;
>+    impl->CloseDevice = JACK_CloseAudio;
>+    impl->Deinitialize = JACK_Deinitialize;
>+
>+    return 1;   /* this audio target is available. */
>+}
>+
>+/* This function waits until it is possible to write a full sound buffer */
>+
>+/* but then why does SDL do PlayAudio then WaitAudio ?
>+ * instead, let's wait in PlayAudio until we get a process() callback.
>+ */
>+
>+static int
>+process(jack_nframes_t nframes, void *arg)
>+{
>+    _THIS = arg;
>+    jack_port_t **client_ports = this->hidden->client_ports;
>+    jack_ringbuffer_t **ringbuffers = this->hidden->ringbuffers;
>+    jack_sample_t *obuf;
>+
>+    int i;
>+    for (i = 0; i < this->spec.channels; i++) {
>+        obuf = JACK_jack_port_get_buffer(client_ports[i], nframes);
>+        int bytes_read = JACK_jack_ringbuffer_read(ringbuffers[i], (char *) obuf,
>+                sizeof(jack_sample_t) * nframes);
>+
>+        /* Fill any remaining buffer with silence */
>+        int frames_read = (bytes_read / sizeof(jack_sample_t));
>+        if (frames_read < nframes ) {
>+            SDL_memset(obuf + frames_read, 0,
>+                    sizeof( jack_sample_t ) * (nframes - frames_read));
>+        }
>+    }
>+
>+    return 0;
>+}
>+
>+static void
>+JACK_PlayAudio(_THIS)
>+{
>+    unsigned chn, dstidx, srcidx, channels = this->spec.channels;
>+    jack_ringbuffer_t **ringbuffers = this->hidden->ringbuffers;
>+    jack_sample_t *scratch = this->hidden->scratch;
>+    jack_sample_t *src = (jack_sample_t *) this->hidden->mixbuf;
>+    const unsigned nframes = this->spec.samples;
>+
>+    for (chn = 0; chn < channels; chn++) {
>+        /* deinterleave source samples into scratch buffer */
>+        for (dstidx = 0, srcidx = 0; dstidx < nframes; dstidx++) {
>+            scratch[dstidx] = src[srcidx];
>+            srcidx += channels;
>+        }
>+
>+        /* copy whole channel into ringbuffer */
>+        JACK_jack_ringbuffer_write(ringbuffers[chn], (const char *) scratch,
>+                sizeof(jack_sample_t) * nframes);
>+    }
>+}
>+
>+/* This function waits until it is possible to write a full sound buffer */
>+static void
>+JACK_WaitAudio(_THIS)
>+{
>+    struct SDL_PrivateAudioData *h = this->hidden;
>+    int i, channels = this->spec.channels;
>+    jack_ringbuffer_t **ringbuffers = this->hidden->ringbuffers;
>+    const size_t nframes = h->mixlen / channels;
>+    const unsigned block_delay = this->spec.samples / this->spec.freq;
>+
>+    for (;;) {
>+        unsigned channels_ready = 0;
>+        for (i = 0; i < channels; i++) {
>+            if (JACK_jack_ringbuffer_write_space(ringbuffers[i]) >= nframes)
>+                ++channels_ready;
>+            else
>+                break;
>+        }
>+        if (channels_ready == channels)
>+            break;
>+        SDL_Delay(block_delay);
>+    }
>+}
>+
>+static Uint8 *
>+JACK_GetAudioBuf(_THIS)
>+{
>+    return this->hidden->mixbuf;
>+}
>+
>+static void
>+JACK_CloseAudio(_THIS)
>+{
>+    int i, channels = this->spec.channels;
>+    jack_port_t **client_ports = this->hidden->client_ports;
>+    jack_client_t *client = this->hidden->client;
>+
>+    SDL_FreeAudioMem(this->hidden->mixbuf);
>+    this->hidden->mixbuf = NULL;
>+    SDL_free(this->hidden->scratch);
>+    this->hidden->scratch = NULL;
>+
>+    if (client) {
>+        if (client_ports) {
>+            for (i = 0; i < channels; i++) {
>+                if (client_ports[0]) {
>+                    if (JACK_jack_port_unregister(client, client_ports[i])) {
>+                        SDL_SetError("jack_port_unregister() failed");
>+                    }
>+                }
>+            }
>+            SDL_free(client_ports);
>+        }
>+        JACK_jack_client_close(client);
>+    }
>+
>+    if (this->hidden->ringbuffers) {
>+        for (i = 0; i < channels; i++)
>+            JACK_jack_ringbuffer_free(this->hidden->ringbuffers[i]);
>+        SDL_free(this->hidden->ringbuffers);
>+    }
>+}
>+
>+static int
>+JACK_OpenAudio(_THIS, const char *devname, int iscapture)
>+{
>+    Uint16 test_format, format;
>+    jack_options_t options;
>+    jack_status_t status;
>+    int i, sample_rate, period_size, channels;
>+    const char **playback_port_names;
>+    static const int RINGBUFFER_SZ = 4096; /* arbitrary power of 2 */
>+
>+    /* Initialize all variables that we clean on shutdown */
>+    this->hidden = SDL_malloc((sizeof *this->hidden));
>+    if (this->hidden == NULL) {
>+        return SDL_OutOfMemory();
>+    }
>+
>+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
>+
>+    options = JackServerName | JackNoStartServer;
>+
>+    if ((this->hidden->client = JACK_jack_client_open(client_name, options, &status,
>+                    server_name)) == NULL) {
>+        JACK_CloseAudio(this);
>+        return SDL_SetError("Unable to initialize jack");
>+    }
>+
>+    sample_rate = JACK_jack_get_sample_rate(this->hidden->client);
>+    period_size = JACK_jack_get_buffer_size(this->hidden->client);
>+    channels = this->spec.channels;
>+
>+    playback_port_names = JACK_jack_get_ports(this->hidden->client, NULL, NULL,
>+            JackPortIsPhysical | JackPortIsInput);
>+
>+    JACK_jack_set_process_callback(this->hidden->client, process, this);
>+
>+    this->hidden->client_ports = SDL_malloc(sizeof(jack_port_t *) * channels);
>+    if (this->hidden->client_ports == NULL) {
>+        JACK_CloseAudio(this);
>+        return SDL_OutOfMemory();
>+    }
>+
>+    this->hidden->ringbuffers =
>+        SDL_malloc(sizeof(jack_ringbuffer_t *) * channels);
>+    if (this->hidden->ringbuffers == NULL) {
>+        JACK_CloseAudio(this);
>+        return SDL_OutOfMemory();
>+    }
>+
>+    for (i = 0; i < channels; i++) {
>+        this->hidden->ringbuffers[i] =
>+            JACK_jack_ringbuffer_create(sizeof(jack_sample_t) * RINGBUFFER_SZ);
>+        if (this->hidden->ringbuffers[i] == NULL) {
>+            JACK_CloseAudio(this);
>+            return SDL_OutOfMemory();
>+        }
>+    }
>+
>+    for (i = 0; i < channels; i++) {
>+        char name[64];
>+        snprintf(name, sizeof(name), "output%d", i + 1);
>+        if ((this->hidden->client_ports[i] =
>+                    JACK_jack_port_register(this->hidden->client, name,
>+                        JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)) == 0) {
>+            JACK_CloseAudio(this);
>+            return SDL_SetError("jack_port_register() failed: %s@%i\n",
>+                    __FILE__, __LINE__);
>+        }
>+    }
>+
>+    /* JACK only supports 32-bit float */
>+    format = 0;
>+    for ( test_format = SDL_FirstAudioFormat(this->spec.format);
>+            ! format && test_format; ) {
>+        switch ( test_format ) {
>+            case AUDIO_F32SYS:
>+                format = 1;
>+                break;
>+            default:
>+                format = 0;
>+                break;
>+        }
>+        if (!format) {
>+            test_format = SDL_NextAudioFormat();
>+        }
>+    }
>+    if (format == 0) {
>+        JACK_CloseAudio(this);
>+        return SDL_SetError("Couldn't find any hardware audio formats");
>+    }
>+    this->spec.format = test_format;
>+    this->spec.freq = sample_rate;
>+    this->spec.samples = period_size;
>+
>+    /* Calculate the final parameters for this audio specification */
>+    SDL_CalculateAudioSpec(&this->spec);
>+
>+    /* Allocate mixing buffer */
>+    this->hidden->mixlen = this->spec.size;
>+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
>+    if (this->hidden->mixbuf == NULL) {
>+        JACK_CloseAudio(this);
>+        return SDL_OutOfMemory();
>+    }
>+
>+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
>+
>+    /* Allocate deinterleaving buffer */
>+    this->hidden->scratch = SDL_malloc(period_size * sizeof(jack_sample_t));
>+    if (this->hidden->scratch == NULL) {
>+        JACK_CloseAudio(this);
>+        return SDL_OutOfMemory();
>+    }
>+
>+    SDL_memset(this->hidden->scratch, this->spec.silence,
>+            period_size * sizeof(jack_sample_t));
>+
>+    if (JACK_jack_activate(this->hidden->client)) {
>+        JACK_CloseAudio(this);
>+        return SDL_SetError("jack_activate() failed");
>+    }
>+
>+    for (i = 0; i < channels; i++) {
>+        if (JACK_jack_connect(this->hidden->client,
>+                    JACK_jack_port_name(this->hidden->client_ports[i]),
>+                    playback_port_names[i])) {
>+            JACK_CloseAudio(this);
>+            return SDL_SetError("jack_connect() failed: %s@%i\n",
>+                                __FILE__, __LINE__);
>+        }
>+    }
>+
>+
>+    /* We're ready to rock and roll. Smile */
>+    return 0;
>+}
>+
>+AudioBootStrap JACK_bootstrap = {
>+    "jack", "Jack Audio Connection Kit", JACK_Init, 0
>+};
>+
>+#endif /* SDL_AUDIO_DRIVER_JACK */
>diff -r 73da2747c268 -r cd4698a9687b src/audio/jack/SDL_jackaudio.h
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/src/audio/jack/SDL_jackaudio.h	Fri Oct 18 23:26:13 2013 -0400
>@@ -0,0 +1,50 @@
>+/*
>+SDL - Simple DirectMedia Layer
>+Copyright (C) 1997-2006 Sam Lantinga
>+Copyright (C) 2013 Tristan Matthews
>+
>+This library is free software; you can redistribute it and/or
>+modify it under the terms of the GNU Lesser General Public
>+License as published by the Free Software Foundation; either
>+version 2.1 of the License, or (at your option) any later version.
>+
>+This library is distributed in the hope that it will be useful,
>+but WITHOUT ANY WARRANTY; without even the implied warranty of
>+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>+Lesser General Public License for more details.
>+
>+You should have received a copy of the GNU Lesser General Public
>+License along with this library; if not, write to the Free Software
>+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>+
>+Sam Lantinga
>+
>+*/
>+#include "SDL_config.h"
>+
>+#ifndef _SDL_jackaudio_h
>+#define _SDL_jackaudio_h
>+
>+#include <jack/jack.h>
>+#include <jack/ringbuffer.h>
>+
>+#include "../SDL_sysaudio.h"
>+
>+#define _THIS	SDL_AudioDevice *this
>+
>+typedef jack_default_audio_sample_t jack_sample_t;
>+
>+struct SDL_PrivateAudioData {
>+    jack_client_t *client;
>+    jack_port_t **client_ports;
>+    jack_ringbuffer_t **ringbuffers;
>+
>+    /* Deinterleave buffer */
>+    jack_sample_t *scratch;
>+
>+    /* Raw mixing buffer */
>+    Uint8 *mixbuf;
>+    int mixlen;
>+};
>+
>+#endif /* _SDL_jackaudio_h */

Actions: View | Diff

Attachments on bug 2163: 1376

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.