summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-05-07 00:06:07 +0000
committerDavid Robillard <d@drobilla.net>2007-05-07 00:06:07 +0000
commitebe4fc9d887cab1f7d6c404581762d797cc744aa (patch)
treeb91fc84bc859ad3b8a9b90fe6b2b6f010df6eb4d
parent34009a45658fedc316dc9cf6715b0d0d1d60fcd6 (diff)
Update Jack system port names to reflect new Jack naming scheme.
git-svn-id: svn://localhost/ardour2/branches/midi@1787 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--SConstruct4
-rw-r--r--libs/midi++2/midi++/jackcompat.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index e6b632a73e..ec14f71390 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1090,8 +1090,8 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Versions/A/
subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
else:
- subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"
- subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"
+ subst_dict['%JACK_INPUT%'] = "system:playback_"
+ subst_dict['%JACK_OUTPUT%'] = "system:capture_"
# posix_memalign available
if not conf.CheckFunc('posix_memalign'):
diff --git a/libs/midi++2/midi++/jackcompat.h b/libs/midi++2/midi++/jackcompat.h
index f1b748ea66..bf179f7333 100644
--- a/libs/midi++2/midi++/jackcompat.h
+++ b/libs/midi++2/midi++/jackcompat.h
@@ -18,7 +18,7 @@
#ifndef JACK_COMPAT_H
#define JACK_COMPAT_H
-#define JACK_MIDI_NEEDS_NFRAMES
+//#define JACK_MIDI_NEEDS_NFRAMES
#if defined(JACK_MIDI_NEEDS_NFRAMES)