smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

only jack+windows use portaudio.

Browse source 
fixes missing lib if portaudio-backend is used on on non-windows
platforms (pkg-config defines HAVE_PORTAUDIO)
This commit is contained in:
Robin Gareus 2015-03-13 13:31:48 +01:00
parent 1cca79258a
commit 7a4f1cb98f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/backends/jack/jack_utils.cc
View file

@ -34,7 +34,7 @@
#include <shlguid.h> // 'IShellLink' #include <shlguid.h> // 'IShellLink'
#endif #endif
#ifdef HAVE_PORTAUDIO #if (defined PLATFORM_WINDOWS && defined HAVE_PORTAUDIO)
#include <portaudio.h> #include <portaudio.h>
#endif #endif
@ -373,7 +373,7 @@ ARDOUR::get_jack_coreaudio_device_names (device_map_t& devices)
void void
ARDOUR::get_jack_portaudio_device_names (device_map_t& devices) ARDOUR::get_jack_portaudio_device_names (device_map_t& devices)
{ {
#ifdef HAVE_PORTAUDIO #if (defined PLATFORM_WINDOWS && defined HAVE_PORTAUDIO)
if (Pa_Initialize() != paNoError) { if (Pa_Initialize() != paNoError) {
return; return;
} }
@ -947,7 +947,7 @@ ARDOUR::enumerate_midi_options ()
midi_options.push_back (make_pair (_("ALSA (JACK1, 0.124 and later)"), alsa_seq_midi_driver_name)); midi_options.push_back (make_pair (_("ALSA (JACK1, 0.124 and later)"), alsa_seq_midi_driver_name));
midi_options.push_back (make_pair (_("ALSA (JACK2, 1.9.8 and later)"), alsa_raw_midi_driver_name)); midi_options.push_back (make_pair (_("ALSA (JACK2, 1.9.8 and later)"), alsa_raw_midi_driver_name));
#endif #endif
#ifdef HAVE_PORTAUDIO #if (defined PLATFORM_WINDOWS && defined HAVE_PORTAUDIO)
/* Windows folks: what name makes sense here? Are there other /* Windows folks: what name makes sense here? Are there other
choices as well ? choices as well ?
*/ */