mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-08 22:55:44 +01:00
Merged with trunk R920.
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c7307c09b8
commit
7bd41538d9
91 changed files with 3496 additions and 867 deletions
|
|
@ -171,9 +171,27 @@ def CheckJackRecomputeLatencies(context):
|
|||
context.Result(result)
|
||||
return result
|
||||
|
||||
jack_video_frame_offset_test = """
|
||||
#include <jack/transport.h>
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
jack_position_t pos;
|
||||
|
||||
pos.valid & JackVideoFrameOffset;
|
||||
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
|
||||
|
||||
conf = Configure(ardour, custom_tests = {
|
||||
'CheckJackClientOpen' : CheckJackClientOpen,
|
||||
'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies
|
||||
'CheckJackRecomputeLatencies' : CheckJackRecomputeLatencies,
|
||||
'CheckJackVideoFrameOffset' : CheckJackVideoFrameOffset
|
||||
})
|
||||
|
||||
if conf.CheckJackClientOpen():
|
||||
|
|
@ -182,6 +200,14 @@ if conf.CheckJackClientOpen():
|
|||
if conf.CheckJackRecomputeLatencies():
|
||||
ardour.Append(CXXFLAGS="-DHAVE_JACK_RECOMPUTE_LATENCIES")
|
||||
|
||||
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')
|
||||
else:
|
||||
print '\nWARNING: You need at least svn revision 985 of jack for hardware monitoring to work correctly.\n'
|
||||
|
||||
#
|
||||
# Optional header files
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue