src/audio/jack/SDL_jackaudio.h
author Sam Lantinga <slouken@libsdl.org>
Fri, 01 Jun 2018 19:43:53 -0700
changeset 12005 94f3f018d3eb
parent 11811 5d94cb6b24d3
child 12503 806492103856
permissions -rw-r--r--
Fixed bug 4184 - jack audio driver fails in presence of midi ports

Martin Širokov

Launching an SDL application with SDL_AUDIODRIVER=jack, and then calling SDL_OpenAudioDevice() with whatever parameters fails with an error like this one:

SDL_OpenAudioDevice: Couldn't connect JACK ports: SDL:sdl_jack_output_0 => system:midi_playback_1

This happens because JACK_OpenDevice in src/audio/jack/SDL_jackaudio.c blindly tries to connect to all input ports without checking whether they are for audio or midi.

The fix is to check port types and ignore all non audio ports. Also I removed devports field from struct SDL_PrivateAudioData, because it's never really used and removing unused ports from it would be PITA.
icculus@11081
     1
/*
icculus@11081
     2
  Simple DirectMedia Layer
slouken@11811
     3
  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
icculus@11081
     4
icculus@11081
     5
  This software is provided 'as-is', without any express or implied
icculus@11081
     6
  warranty.  In no event will the authors be held liable for any damages
icculus@11081
     7
  arising from the use of this software.
icculus@11081
     8
icculus@11081
     9
  Permission is granted to anyone to use this software for any purpose,
icculus@11081
    10
  including commercial applications, and to alter it and redistribute it
icculus@11081
    11
  freely, subject to the following restrictions:
icculus@11081
    12
icculus@11081
    13
  1. The origin of this software must not be misrepresented; you must not
icculus@11081
    14
     claim that you wrote the original software. If you use this software
icculus@11081
    15
     in a product, an acknowledgment in the product documentation would be
icculus@11081
    16
     appreciated but is not required.
icculus@11081
    17
  2. Altered source versions must be plainly marked as such, and must not be
icculus@11081
    18
     misrepresented as being the original software.
icculus@11081
    19
  3. This notice may not be removed or altered from any source distribution.
icculus@11081
    20
*/
slouken@11382
    21
#ifndef SDL_jackaudio_h_
slouken@11382
    22
#define SDL_jackaudio_h_
icculus@11081
    23
icculus@11081
    24
#include <jack/jack.h>
icculus@11081
    25
icculus@11081
    26
#include "../SDL_sysaudio.h"
icculus@11081
    27
icculus@11081
    28
/* Hidden "this" pointer for the audio functions */
icculus@11081
    29
#define _THIS SDL_AudioDevice *this
icculus@11081
    30
icculus@11081
    31
struct SDL_PrivateAudioData
icculus@11081
    32
{
icculus@11083
    33
    jack_client_t *client;
icculus@11081
    34
    SDL_sem *iosem;
icculus@11081
    35
    float *iobuffer;
icculus@11081
    36
    jack_port_t **sdlports;
icculus@11081
    37
};
icculus@11081
    38
slouken@11382
    39
#endif /* SDL_jackaudio_h_ */
icculus@11081
    40
icculus@11081
    41
/* vi: set ts=4 sw=4 expandtab: */