diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2006-08-31 03:44:44 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2006-08-31 03:44:44 +0000 |
| commit | dde980289aaf264863186eead99fd98a67cc6862 (patch) | |
| tree | ba5890550fcdef545f84d68ca1379133f4fb5cf6 | |
| parent | a61f25dfe9dcf1f29852d917779529d26e762ea5 (diff) | |
Add a check for for jack function jack_port_ensure_monitor to
allow building successfully with older versions of jack.
git-svn-id: svn://localhost/ardour2/trunk@876 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 11 | ||||
| -rw-r--r-- | libs/ardour/ardour/port.h | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 6de22b3587..57177fa173 100644 --- a/SConstruct +++ b/SConstruct @@ -467,6 +467,17 @@ if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == 0: libraries['boost'] = conf.Finish () +conf = env.Configure () + +# jack_port_ensure_monitor available + +if conf.CheckFunc('jack_port_ensure_monitor'): + env.Append(CCFLAGS='-DWITH_JACK_PORT_ENSURE_MONITOR') +else: + print '\nWARNING: You need at least svn revision 985 of jack for hardware monitoring to work correctly.\n' + +env = conf.Finish() + # # Check for liblo diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 1093450840..391289be3f 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -136,7 +136,13 @@ class Port : public sigc::trackable { } void ensure_monitor_input (bool yn) { + +#ifdef WITH_JACK_PORT_ENSURE_MONITOR jack_port_ensure_monitor (_port, yn); +#else + jack_port_request_monitor(_port, yn); +#endif + } /*XXX completely bloody useless imho*/ |