diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-08 14:02:03 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-08 14:02:03 -0400 |
| commit | c98abed37fd9ffd7402f3ecf2c05df811488d610 (patch) | |
| tree | 35d6ed35896e73236038ed4ce157b2b6b93242b6 /libs/backends/jack/jack_audiobackend.h | |
| parent | 7e077bdebaa20eff758a812821e1c80991c1e59b (diff) | |
restore jack timebase master and jack session callback functionality (moved into the JACK backend)
Diffstat (limited to 'libs/backends/jack/jack_audiobackend.h')
| -rw-r--r-- | libs/backends/jack/jack_audiobackend.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index b8d8b3b3f1..cb24835d5b 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -30,15 +30,14 @@ #include <boost/shared_ptr.hpp> #include <jack/jack.h> -#ifdef HAVE_JACK_SESSION #include <jack/session.h> -#endif #include "ardour/audio_backend.h" namespace ARDOUR { class JackConnection; +class JACKSession; class JACKAudioBackend : public AudioBackend { public: @@ -196,9 +195,7 @@ class JACKAudioBackend : public AudioBackend { static int _jack_sync_callback (jack_transport_state_t, jack_position_t*, void *arg); static void _freewheel_callback (int , void *arg); static void _latency_callback (jack_latency_callback_mode_t, void*); -#ifdef HAVE_JACK_SESSION static void _session_callback (jack_session_event_t *event, void *arg); -#endif void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int); int jack_sync_callback (jack_transport_state_t, jack_position_t*); @@ -261,6 +258,12 @@ class JACKAudioBackend : public AudioBackend { void when_connected_to_jack (); PBD::ScopedConnection jack_connection_connection; + + /* Object to manage interactions with Session in a way that + keeps JACK out of libardour directly + */ + + JACKSession* _session; }; } // namespace |