From 5f866fc1858365b97742f3a0ff02c5f8c904c8a2 Mon Sep 17 00:00:00 2001
From: Nick Mainsbridge <beatroute@iprimus.com.au>
Date: Fri, 24 Nov 2006 16:37:43 +0000
Subject: [PATCH] fix up scons check for hardware monitoring, minor error
 message typo

git-svn-id: svn://localhost/ardour2/trunk@1157 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour_ui_options.cc |  2 +-
 libs/ardour/SConscript           | 31 ++++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index ea1c1c13f4..8bb5782cce 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -236,7 +236,7 @@ ARDOUR_UI::set_monitor_model (MonitorModel model)
 		break;
 
 	default:
-		fatal << string_compose (_("programming error: unknown solo model in ARDOUR_UI::set_solo_model: %1"), model) << endmsg;
+		fatal << string_compose (_("programming error: unknown monitor model in ARDOUR_UI::set_monitor_model: %1"), model) << endmsg;
 		/*NOTREACHED*/
 	}
 
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 334cf60e4e..45c4f952bf 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -165,17 +165,38 @@ int main(int argc, char** argv)
 	return 0;
 }
 """
-
 def CheckJackVideoFrameOffset(context):
 	context.Message('Checking for JackVideoFrameOffset in jack_position_bits_t enum...')
 	result = context.TryLink(jack_video_frame_offset_test, '.c')
 	context.Result(result)
 	return result
 
+#
+# See if JACK supports jack_port_ensure_monitor_input()
+#
+jack_ensure_monitor_input_test = """
+#include <jack/jack.h>
+int main(int argc, char** argv)
+{
+	    jack_port_t **port;
+
+	    jack_port_ensure_monitor (*port, 1);
+	    return 0;
+
+}
+"""
+
+def CheckJackEnsureMonitorInput(context):
+        context.Message('Checking for jack_port_ensure_monitor_input()...')
+        result = context.TryLink(jack_ensure_monitor_input_test, '.c')
+        context.Result(result)
+        return result
+
 conf = Configure(ardour, custom_tests = {
 	'CheckJackClientOpen' : CheckJackClientOpen,
 	'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies,
-	'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset
+	'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset,
+	'CheckJackEnsureMonitorInput' : CheckJackEnsureMonitorInput
 })
 
 if conf.CheckJackClientOpen():
@@ -186,9 +207,9 @@ if conf.CheckJackRecomputeLatencies():
 
 if conf.CheckJackVideoFrameOffset():
 	ardour.Append(CXXFLAGS="-DHAVE_JACK_VIDEO_SUPPORT")
-
-if conf.CheckFunc('jack_port_ensure_monitor'):
-    env.Append(CCFLAGS='-DHAVE_JACK_PORT_ENSURE_MONITOR')
+	
+if conf.CheckJackEnsureMonitorInput():
+	env.Append(CCFLAGS='-DHAVE_JACK_PORT_ENSURE_MONITOR')
 else:
     print '\nWARNING: You need at least svn revision 985 of jack for hardware monitoring to work correctly.\n'