ardour/livetrax
13
0
Fork 0
Code

fix up scons check for hardware monitoring, minor error message typo

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1157 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge 2006-11-24 16:37:43 +00:00
parent 07e5604bf5
commit 5f866fc185
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_options.cc
View File

@ -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*/
}

31
libs/ardour/SConscript
View File

@ -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'