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

diff --git a/SConstruct b/SConstruct
index e6b632a73e157fdee2378e7a4455a142cfdd5d6b..ec14f713908f0e5ced59eb091ecba9dd271740cd 100644 (file)
--- 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 f1b748ea66f6775d6f997bd719fb9b2ff3ef7f31..bf179f7333bbf524e78fa6dc20ad0068246af4df 100644 (file)
--- 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)