smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

restore jack timebase master and jack session callback functionality (moved into the JACK backend)

Browse source
This commit is contained in:
Paul Davis 2013-10-08 14:02:03 -04:00
parent 7e077bdeba
commit c98abed37f
5 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/ardour/session.h
View file

@ -881,15 +881,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
MIDI::MachineControl& mmc() { return *_mmc; } MIDI::MachineControl& mmc() { return *_mmc; }
/* Callbacks specifically related to JACK, and called directly
* from the JACK audio backend.
*/
#ifdef HAVE_JACK_SESSION
void jack_session_event (jack_session_event_t* event);
#endif
void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int);
protected: protected:
friend class AudioEngine; friend class AudioEngine;
void set_block_size (pframes_t nframes); void set_block_size (pframes_t nframes);

1
libs/ardour/wscript
View file

@ -180,7 +180,6 @@ libardour_sources = [
'session_events.cc', 'session_events.cc',
'session_export.cc', 'session_export.cc',
'session_handle.cc', 'session_handle.cc',
'session_jack.cc',
'session_ltc.cc', 'session_ltc.cc',
'session_metadata.cc', 'session_metadata.cc',
'session_midi.cc', 'session_midi.cc',

10
libs/backends/jack/jack_audiobackend.cc
View file

@ -37,6 +37,7 @@
#include "jack_audiobackend.h" #include "jack_audiobackend.h"
#include "jack_connection.h" #include "jack_connection.h"
#include "jack_utils.h" #include "jack_utils.h"
#include "jack_session.h"
#include "i18n.h" #include "i18n.h"
@ -64,6 +65,7 @@ JACKAudioBackend::JACKAudioBackend (AudioEngine& e, boost::shared_ptr<JackConnec
, _target_systemic_output_latency (0) , _target_systemic_output_latency (0)
, _current_sample_rate (0) , _current_sample_rate (0)
, _current_buffer_size (0) , _current_buffer_size (0)
, _session (0)
{ {
_jack_connection->Connected.connect_same_thread (jack_connection_connection, boost::bind (&JACKAudioBackend::when_connected_to_jack, this)); _jack_connection->Connected.connect_same_thread (jack_connection_connection, boost::bind (&JACKAudioBackend::when_connected_to_jack, this));
_jack_connection->Disconnected.connect_same_thread (disconnect_connection, boost::bind (&JACKAudioBackend::disconnected, this, _1)); _jack_connection->Disconnected.connect_same_thread (disconnect_connection, boost::bind (&JACKAudioBackend::disconnected, this, _1));
@ -748,7 +750,8 @@ JACKAudioBackend::jack_timebase_callback (jack_transport_state_t state, pframes_
ARDOUR::Session* session = engine.session(); ARDOUR::Session* session = engine.session();
if (session) { if (session) {
session->jack_timebase_callback (state, nframes, pos, new_position); JACKSession jsession (session);
jsession.timebase_callback (state, nframes, pos, new_position);
} }
} }
@ -793,7 +796,6 @@ JACKAudioBackend::_xrun_callback (void *arg)
return 0; return 0;
} }
#ifdef HAVE_JACK_SESSION
void void
JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg) JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg)
{ {
@ -801,10 +803,10 @@ JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg)
ARDOUR::Session* session = jab->engine.session(); ARDOUR::Session* session = jab->engine.session();
if (session) { if (session) {
session->jack_session_event (event); JACKSession jsession (session);
jsession.session_event (event);
} }
} }
#endif
void void
JACKAudioBackend::_freewheel_callback (int onoff, void *arg) JACKAudioBackend::_freewheel_callback (int onoff, void *arg)

11
libs/backends/jack/jack_audiobackend.h
View file

@ -30,15 +30,14 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <jack/jack.h> #include <jack/jack.h>
#ifdef HAVE_JACK_SESSION
#include <jack/session.h> #include <jack/session.h>
#endif
#include "ardour/audio_backend.h" #include "ardour/audio_backend.h"
namespace ARDOUR { namespace ARDOUR {
class JackConnection; class JackConnection;
class JACKSession;
class JACKAudioBackend : public AudioBackend { class JACKAudioBackend : public AudioBackend {
public: public:
@ -196,9 +195,7 @@ class JACKAudioBackend : public AudioBackend {
static int _jack_sync_callback (jack_transport_state_t, jack_position_t*, void *arg); static int _jack_sync_callback (jack_transport_state_t, jack_position_t*, void *arg);
static void _freewheel_callback (int , void *arg); static void _freewheel_callback (int , void *arg);
static void _latency_callback (jack_latency_callback_mode_t, void*); 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); 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); 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*); int jack_sync_callback (jack_transport_state_t, jack_position_t*);
@ -261,6 +258,12 @@ class JACKAudioBackend : public AudioBackend {
void when_connected_to_jack (); void when_connected_to_jack ();
PBD::ScopedConnection jack_connection_connection; PBD::ScopedConnection jack_connection_connection;
/* Object to manage interactions with Session in a way that
keeps JACK out of libardour directly
*/
JACKSession* _session;
}; };
} // namespace } // namespace

3
libs/backends/jack/wscript
View file

@ -28,7 +28,8 @@ def build(bld):
'jack_connection.cc', 'jack_connection.cc',
'jack_audiobackend.cc', 'jack_audiobackend.cc',
'jack_portengine.cc', 'jack_portengine.cc',
'jack_utils.cc' 'jack_utils.cc',
'jack_session.cc',
] ]
obj.includes = ['.'] obj.includes = ['.']
obj.cxxflags = [ '-fPIC' ] obj.cxxflags = [ '-fPIC' ]