diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-15 18:47:10 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-15 18:47:10 +0000 |
| commit | 01c253b61b3130d13f9e30f17683e0f8a93b4696 (patch) | |
| tree | 4bd1f5abe12d754d5f3a684141899b06229141f3 /libs/ardour/session_transport.cc | |
| parent | c0868805b7f329452882a61637ef8d97073bf47b (diff) | |
part one of several parts: implement support for new (and correct) JACK latency API
git-svn-id: svn://localhost/ardour2/branches/3.0@8863 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_transport.cc')
| -rw-r--r-- | libs/ardour/session_transport.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 0aab6a7e27..7d58a97e77 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -21,6 +21,10 @@ #include <cerrno> #include <unistd.h> +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include "pbd/undo.h" #include "pbd/error.h" @@ -1507,10 +1511,7 @@ Session::update_latency_compensation (bool with_stop, bool abort) _worst_track_latency = 0; ptw = post_transport_work(); -#undef DEBUG_LATENCY -#ifdef DEBUG_LATENCY - cerr << "\n---------------------------------\nUPDATE LATENCY\n"; -#endif + DEBUG_TRACE(DEBUG::Latency, "---------------------------- update latency\n\n") boost::shared_ptr<RouteList> r = routes.reader (); @@ -1524,8 +1525,10 @@ Session::update_latency_compensation (bool with_stop, bool abort) framecnt_t track_latency = (*i)->update_total_latency (); if (old_latency != track_latency) { +#if !HAVE_JACK_NEW_LATENCY (*i)->input()->update_port_total_latencies (); (*i)->output()->update_port_total_latencies (); +#endif update_jack = true; } @@ -1538,9 +1541,7 @@ Session::update_latency_compensation (bool with_stop, bool abort) _engine.update_total_latencies (); } -#ifdef DEBUG_LATENCY - cerr << "\tworst was " << _worst_track_latency << endl; -#endif + DEBUG_TRACE(DEBUG::Latency, string_compose("worst case latency was %1\n", _worst_track_latency)); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { (*i)->set_latency_delay (_worst_track_latency); |