diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-15 19:55:14 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-15 19:55:14 +0000 |
| commit | 1c3f709bf75d86462b4441470d5108cdc049301b (patch) | |
| tree | 9246d3b43955d61a35b780fcd19b8df7f7bec1ed /libs/ardour/ardour | |
| parent | 01c253b61b3130d13f9e30f17683e0f8a93b4696 (diff) | |
part two of new JACK latency API support - should fix broken compilation
git-svn-id: svn://localhost/ardour2/branches/3.0@8864 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 5 | ||||
| -rw-r--r-- | libs/ardour/ardour/port.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 390c0bbda6..b63bcfc65f 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -318,6 +318,11 @@ _ the regular process() call to session->process() is not made. int jack_bufsize_callback (pframes_t); int jack_sample_rate_callback (pframes_t); +#ifdef HAVE_JACK_NEW_LATENCY + static void _latency_callback (jack_latency_callback_mode_t, void*); + void jack_latency_callback (jack_latency_callback_mode_t); +#endif + int connect_to_jack (std::string client_name, std::string session_uuid); static void halted (void *); diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 45256a61fe..21d26397b3 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -99,8 +99,10 @@ public: void request_monitor_input (bool); void set_latency (framecnt_t); +#ifdef HAVE_JACK_NEW_LATENCY void get_connected_latency_range (jack_latency_range_t& range, jack_latency_callback_mode_t mode) const; void set_latency_range (jack_latency_range_t& range, jack_latency_callback_mode_t mode) const; +#endif virtual void reset (); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 293d9d391f..d6b35aa998 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1361,6 +1361,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void reset_jack_connection (jack_client_t* jack); void process_rtop (SessionEvent*); +#ifdef HAVE_JACK_NEW_LATENCY + void update_latency (bool playback); +#endif + XMLNode& state(bool); /* click track */ |