From a34d7071753867b9aba3bca2f3436ed4a980c895 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 9 Aug 2013 12:15:37 -0400 Subject: split up session code that uses parts of the JACK API (timebase + session event handling) and connect it directly to the jack audiobackend i've made the audiobackend call the session directly so that only one object (ARDOUR::Session) has a need for the JACK types and only one .cc file (session_jack.cc) needs jack.h. having ARDOUR::AudioEngine act as an intermediary would be cleaner conceptually but would end up causing two different ARDOUR objects to have jack types in their own API. --- libs/ardour/audioengine.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'libs/ardour/audioengine.cc') diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 45cc33cdc1..2b9a50f1ef 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -891,21 +891,11 @@ AudioEngine::thread_init_callback (void* arg) } } -/* XXXX -void -AudioEngine::timebase_callback (TransportState state, pframes_t nframes, jack_position_t pos, int new_position) -{ - if (_session && _session->synced_to_jack()) { - // _session->timebase_callback (state, nframes, pos, new_position); - } -} -*/ - int AudioEngine::sync_callback (TransportState state, framepos_t position) { if (_session) { - return _session->jack_sync_callback (state, position); + return _session->backend_sync_callback (state, position); } return 0; } -- cgit v1.2.3