X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=2e5aea9047282a6e1ba75e46b6b2cfdfff1174d4;hb=e374518ca9c4643874eee3877e270eef32d95f18;hp=b563537cb39b4913f0ba7cf2898a095e8f9dc3f2;hpb=e6eb059576eefd9a26c177627ae7dd3ba2feb727;p=ardour.git diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index b563537cb3..2e5aea9047 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,23 +31,23 @@ #include "midi++/jack.h" +#include "ardour/amp.h" +#include "ardour/audio_port.h" #include "ardour/audioengine.h" #include "ardour/buffer.h" -#include "ardour/delivery.h" -#include "ardour/port.h" -#include "ardour/audio_port.h" -#include "ardour/midi_port.h" -#include "ardour/meter.h" -#include "ardour/session.h" +#include "ardour/buffer_set.h" #include "ardour/cycle_timer.h" -#include "ardour/utils.h" +#include "ardour/delivery.h" #include "ardour/event_type_map.h" +#include "ardour/internal_return.h" #include "ardour/io.h" -#include "ardour/amp.h" +#include "ardour/meter.h" +#include "ardour/midi_port.h" +#include "ardour/port.h" #include "ardour/port_set.h" -#include "ardour/buffer_set.h" - +#include "ardour/session.h" #include "ardour/timestamps.h" +#include "ardour/utils.h" #include "i18n.h" @@ -56,10 +56,16 @@ using namespace ARDOUR; using namespace PBD; gint AudioEngine::m_meter_exit; +AudioEngine* AudioEngine::_instance = 0; -AudioEngine::AudioEngine (string client_name) +#define GET_PRIVATE_JACK_POINTER(j) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; } +#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; } + +AudioEngine::AudioEngine (string client_name) : ports (new Ports) { + _instance = this; /* singleton */ + session = 0; session_remove_pending = false; _running = false; @@ -82,7 +88,7 @@ AudioEngine::AudioEngine (string client_name) } Port::set_engine (this); - + // Initialize parameter metadata (e.g. ranges) Evoral::Parameter p(NullAutomation); p = EventTypeMap::instance().new_parameter(NullAutomation); @@ -106,12 +112,12 @@ AudioEngine::~AudioEngine () { Glib::Mutex::Lock tm (_process_lock); session_removed.signal (); - + if (_running) { jack_client_close (_jack); _jack = 0; } - + stop_metering_thread (); } } @@ -123,7 +129,7 @@ AudioEngine::jack() const } void -_thread_init_callback (void *arg) +_thread_init_callback (void * /*arg*/) { /* make sure that anybody who needs to know about this thread knows about it. @@ -138,21 +144,18 @@ _thread_init_callback (void *arg) int AudioEngine::start () { - if (!_jack) { - error << _("AudioEngine::start() called while disconnected from JACK") << endmsg; - return -1; - } + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); if (!_running) { - nframes_t blocksize = jack_get_buffer_size (_jack); - + nframes_t blocksize = jack_get_buffer_size (_priv_jack); + if (session) { BootMessage (_("Connect session to engine")); session->set_block_size (blocksize); - session->set_frame_rate (jack_get_sample_rate (_jack)); - + session->set_frame_rate (jack_get_sample_rate (_priv_jack)); + /* page in as much of the session process code as we can before we really start running. */ @@ -170,21 +173,22 @@ AudioEngine::start () _processed_frames = 0; last_monitor_check = 0; - jack_on_shutdown (_jack, halted, this); - jack_set_graph_order_callback (_jack, _graph_order_callback, this); - jack_set_thread_init_callback (_jack, _thread_init_callback, this); - jack_set_process_callback (_jack, _process_callback, this); - jack_set_sample_rate_callback (_jack, _sample_rate_callback, this); - jack_set_buffer_size_callback (_jack, _bufsize_callback, this); - jack_set_xrun_callback (_jack, _xrun_callback, this); - jack_set_sync_callback (_jack, _jack_sync_callback, this); - jack_set_freewheel_callback (_jack, _freewheel_callback, this); + jack_on_shutdown (_priv_jack, halted, this); + jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this); + jack_set_thread_init_callback (_priv_jack, _thread_init_callback, this); + jack_set_process_callback (_priv_jack, _process_callback, this); + jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this); + jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this); + jack_set_xrun_callback (_priv_jack, _xrun_callback, this); + jack_set_sync_callback (_priv_jack, _jack_sync_callback, this); + jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this); + jack_set_port_registration_callback (_priv_jack, _registration_callback, this); if (session && session->config.get_jack_time_master()) { - jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); + jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this); } - if (jack_activate (_jack) == 0) { + if (jack_activate (_priv_jack) == 0) { _running = true; _has_run = true; Running(); /* EMIT SIGNAL */ @@ -203,11 +207,13 @@ AudioEngine::start () int AudioEngine::stop (bool forever) { - if (_jack) { + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + + if (_priv_jack) { if (forever) { disconnect_from_jack (); } else { - jack_deactivate (_jack); + jack_deactivate (_priv_jack); Stopped(); /* EMIT SIGNAL */ } } @@ -222,17 +228,21 @@ AudioEngine::get_sync_offset (nframes_t& offset) const #ifdef HAVE_JACK_VIDEO_SUPPORT + GET_PRIVATE_JACK_POINTER_RET (_jack, false); + jack_position_t pos; - - if (_jack) { - (void) jack_transport_query (_jack, &pos); - + + if (_priv_jack) { + (void) jack_transport_query (_priv_jack, &pos); + if (pos.valid & JackVideoFrameOffset) { offset = pos.video_offset; return true; } } - +#else + /* keep gcc happy */ + offset = 0; #endif return false; @@ -307,6 +317,13 @@ AudioEngine::_freewheel_callback (int onoff, void *arg) static_cast(arg)->_freewheeling = onoff; } +void +AudioEngine::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* arg) +{ + AudioEngine* ae = static_cast (arg); + ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */ +} + void AudioEngine::split_cycle (nframes_t offset) { @@ -330,13 +347,13 @@ AudioEngine::split_cycle (nframes_t offset) int AudioEngine::process_callback (nframes_t nframes) { + GET_PRIVATE_JACK_POINTER_RET(_jack,0) // CycleTimer ct ("AudioEngine::process"); - Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK); /// The number of frames that will have been processed when we've finished nframes_t next_processed_frames; - + /* handle wrap around of total frames counter */ if (max_frames - _processed_frames < nframes) { @@ -364,6 +381,7 @@ AudioEngine::process_callback (nframes_t nframes) Delivery::CycleStart (nframes); Port::set_port_offset (0); + InternalReturn::CycleStart (nframes); /* tell all Ports that we're starting a new cycle */ @@ -376,7 +394,7 @@ AudioEngine::process_callback (nframes_t nframes) if (_freewheeling) { /* emit the Freewheel signal and stop freewheeling in the event of trouble */ if (Freewheel (nframes)) { - jack_set_freewheel (_jack, false); + jack_set_freewheel (_priv_jack, false); } } else { @@ -384,7 +402,7 @@ AudioEngine::process_callback (nframes_t nframes) session->process (nframes); } } - + if (_freewheeling) { return 0; } @@ -399,13 +417,13 @@ AudioEngine::process_callback (nframes_t nframes) boost::shared_ptr p = ports.reader(); for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - + Port *port = (*i); bool x; - + if (port->_last_monitor != (x = port->monitoring_input ())) { port->_last_monitor = x; - /* XXX I think this is dangerous, due to + /* XXX I think this is dangerous, due to a likely mutex in the signal handlers ... */ port->MonitorInputChanged (x); /* EMIT SIGNAL */ @@ -419,14 +437,14 @@ AudioEngine::process_callback (nframes_t nframes) boost::shared_ptr p = ports.reader(); for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - + Port *port = (*i); - + if (port->sends_output()) { port->get_buffer(nframes).silence(nframes); } } - } + } // Finalize ports @@ -449,12 +467,12 @@ AudioEngine::jack_sample_rate_callback (nframes_t nframes) { _frame_rate = nframes; _usecs_per_cycle = (int) floor ((((double) frames_per_cycle() / nframes)) * 1000000.0); - + /* check for monitor input change every 1/10th of second */ monitor_check_interval = nframes / 10; last_monitor_check = 0; - + if (session) { session->set_frame_rate (nframes); } @@ -525,7 +543,7 @@ AudioEngine::meter_thread () } } -void +void AudioEngine::set_session (Session *s) { Glib::Mutex::Lock pl (_process_lock); @@ -535,11 +553,11 @@ AudioEngine::set_session (Session *s) session = s; nframes_t blocksize = jack_get_buffer_size (_jack); - + /* page in as much of the session process code as we can before we really start running. */ - + boost::shared_ptr p = ports.reader(); for (Ports::iterator i = p->begin(); i != p->end(); ++i) { @@ -561,7 +579,7 @@ AudioEngine::set_session (Session *s) } } -void +void AudioEngine::remove_session () { Glib::Mutex::Lock lm (_process_lock); @@ -576,30 +594,30 @@ AudioEngine::remove_session () } else { session = 0; } - - //FIXME: Preliminary bugfix for http://tracker.ardour.org/view.php?id=1985 - //remove_all_ports (); + + remove_all_ports (); } void AudioEngine::port_registration_failure (const std::string& portname) { + GET_PRIVATE_JACK_POINTER (_jack); string full_portname = jack_client_name; full_portname += ':'; full_portname += portname; - - - jack_port_t* p = jack_port_by_name (_jack, full_portname.c_str()); + + + jack_port_t* p = jack_port_by_name (_priv_jack, full_portname.c_str()); string reason; - + if (p) { reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname); } else { reason = _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks."); } - + throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str()); -} +} Port * AudioEngine::register_port (DataType dtype, const string& portname, bool input) @@ -614,7 +632,7 @@ AudioEngine::register_port (DataType dtype, const string& portname, bool input) } else { throw PortRegistrationFailure("unable to create port (unknown type)"); } - + size_t& old_buffer_size = _raw_buffer_sizes[newport->type()]; size_t port_buffer_size = newport->raw_buffer_size(0); if (port_buffer_size > old_buffer_size) { @@ -657,7 +675,7 @@ AudioEngine::unregister_port (Port& port) { /* caller must hold process lock */ - if (!_running) { + if (!_running) { /* probably happening when the engine has been halted by JACK, in which case, there is nothing we can do here. */ @@ -667,7 +685,7 @@ AudioEngine::unregister_port (Port& port) { RCUWriter writer (ports); boost::shared_ptr ps = writer.get_copy (); - + for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) { if ((*i) == &port) { delete *i; @@ -675,20 +693,18 @@ AudioEngine::unregister_port (Port& port) break; } } - + /* writer goes out of scope, forces update */ } - - remove_connections_for (port); return 0; } -int +int AudioEngine::connect (const string& source, const string& destination) { /* caller must hold process lock */ - + int ret; if (!_running) { @@ -703,10 +719,11 @@ AudioEngine::connect (const string& source, const string& destination) string s = make_port_name_non_relative (source); string d = make_port_name_non_relative (destination); + Port* src = get_port_by_name_locked (s); Port* dst = get_port_by_name_locked (d); - if (src) { + if (src) { ret = src->connect (d); } else if (dst) { ret = dst->connect (s); @@ -714,25 +731,23 @@ AudioEngine::connect (const string& source, const string& destination) /* neither port is known to us, and this API isn't intended for use as a general patch bay */ ret = -1; } - + if (ret > 0) { - error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"), - source, s, destination, d) - << endmsg; + /* already exists - no error, no warning */ } else if (ret < 0) { - error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), - source, s, destination, d) + error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), + source, s, destination, d) << endmsg; } return ret; } -int +int AudioEngine::disconnect (const string& source, const string& destination) { /* caller must hold process lock */ - + int ret; if (!_running) { @@ -743,7 +758,7 @@ AudioEngine::disconnect (const string& source, const string& destination) return -1; } } - + string s = make_port_name_non_relative (source); string d = make_port_name_non_relative (destination); @@ -764,6 +779,8 @@ AudioEngine::disconnect (const string& source, const string& destination) int AudioEngine::disconnect (Port& port) { + GET_PRIVATE_JACK_POINTER_RET (_jack,-1); + if (!_running) { if (!_has_run) { fatal << _("disconnect called before engine was started") << endmsg; @@ -779,17 +796,11 @@ AudioEngine::disconnect (Port& port) ARDOUR::nframes_t AudioEngine::frame_rate () { - if (_jack) { - if (_frame_rate == 0) { - return (_frame_rate = jack_get_sample_rate (_jack)); - } else { - return _frame_rate; - } + GET_PRIVATE_JACK_POINTER_RET (_jack,0); + if (_frame_rate == 0) { + return (_frame_rate = jack_get_sample_rate (_priv_jack)); } else { - fatal << X_("programming error: AudioEngine::frame_rate() called while disconnected from JACK") - << endmsg; - /*NOTREACHED*/ - return 0; + return _frame_rate; } } @@ -803,17 +814,11 @@ AudioEngine::raw_buffer_size (DataType t) ARDOUR::nframes_t AudioEngine::frames_per_cycle () { - if (_jack) { - if (_buffer_size == 0) { - return (_buffer_size = jack_get_buffer_size (_jack)); - } else { - return _buffer_size; - } + GET_PRIVATE_JACK_POINTER_RET (_jack,0); + if (_buffer_size == 0) { + return (_buffer_size = jack_get_buffer_size (_jack)); } else { - fatal << X_("programming error: AudioEngine::frame_rate() called while disconnected from JACK") - << endmsg; - /*NOTREACHED*/ - return 0; + return _buffer_size; } } @@ -824,10 +829,15 @@ AudioEngine::frames_per_cycle () Port * AudioEngine::get_port_by_name (const string& portname) { - assert (portname.find_first_of (':') != string::npos); - + string s; + if (portname.find_first_of (':') == string::npos) { + s = make_port_name_non_relative (portname); + } else { + s = portname; + } + Glib::Mutex::Lock lm (_process_lock); - return get_port_by_name_locked (portname); + return get_port_by_name_locked (s); } Port * @@ -862,13 +872,10 @@ AudioEngine::get_port_by_name_locked (const string& portname) return 0; } - - - - const char ** AudioEngine::get_ports (const string& port_name_pattern, const string& type_name_pattern, uint32_t flags) { + GET_PRIVATE_JACK_POINTER_RET (_jack,0); if (!_running) { if (!_has_run) { fatal << _("get_ports called before engine was started") << endmsg; @@ -877,12 +884,14 @@ AudioEngine::get_ports (const string& port_name_pattern, const string& type_name return 0; } } - return jack_get_ports (_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags); + return jack_get_ports (_priv_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags); } void AudioEngine::halted (void *arg) { + /* called from jack shutdown handler */ + AudioEngine* ae = static_cast (arg); bool was_running = ae->_running; @@ -897,16 +906,26 @@ AudioEngine::halted (void *arg) } } +void +AudioEngine::died () +{ + /* called from a signal handler for SIGPIPE */ + + stop_metering_thread (); + + _running = false; + _buffer_size = 0; + _frame_rate = 0; + _jack = 0; +} + bool -AudioEngine::can_request_hardware_monitoring () +AudioEngine::can_request_hardware_monitoring () { + GET_PRIVATE_JACK_POINTER_RET (_jack,false); const char ** ports; - if (!_jack) { - return 0; - } - - if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) { + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) { return false; } @@ -919,14 +938,11 @@ AudioEngine::can_request_hardware_monitoring () uint32_t AudioEngine::n_physical_outputs (DataType type) const { + GET_PRIVATE_JACK_POINTER_RET (_jack,0); const char ** ports; uint32_t i = 0; - if (!_jack) { - return 0; - } - - if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) { + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) { return 0; } @@ -939,35 +955,29 @@ AudioEngine::n_physical_outputs (DataType type) const uint32_t AudioEngine::n_physical_inputs (DataType type) const { + GET_PRIVATE_JACK_POINTER_RET (_jack,0); const char ** ports; uint32_t i = 0; - - if (!_jack) { - return 0; - } - - if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) { + + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) { return 0; } - if (ports) { - for (i = 0; ports[i]; ++i) {} - free (ports); - } + for (i = 0; ports[i]; ++i) {} + free (ports); + return i; } void AudioEngine::get_physical_inputs (DataType type, vector& ins) { + GET_PRIVATE_JACK_POINTER (_jack); const char ** ports; uint32_t i = 0; - - if (!_jack) { - return; - } - - if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) { + + + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) { return; } @@ -982,47 +992,32 @@ AudioEngine::get_physical_inputs (DataType type, vector& ins) void AudioEngine::get_physical_outputs (DataType type, vector& outs) { + GET_PRIVATE_JACK_POINTER (_jack); const char ** ports; uint32_t i = 0; - - if (!_jack) { - return; - } - - if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) { + + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) { return; } - if (ports) { - for (i = 0; ports[i]; ++i) { - outs.push_back (ports[i]); - } - free (ports); + for (i = 0; ports[i]; ++i) { + outs.push_back (ports[i]); } + free (ports); } string AudioEngine::get_nth_physical (DataType type, uint32_t n, int flag) { + GET_PRIVATE_JACK_POINTER_RET (_jack,""); const char ** ports; uint32_t i; string ret; assert(type != DataType::NIL); - if (!_running || !_jack) { - if (!_has_run) { - fatal << _("get_nth_physical called before engine was started") << endmsg; - /*NOTREACHED*/ - } else { - return ""; - } - } - - ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|flag); - - if (ports == 0) { - return ""; + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|flag)) == 0) { + return ret; } for (i = 0; i < n && ports[i]; ++i) {} @@ -1039,91 +1034,69 @@ AudioEngine::get_nth_physical (DataType type, uint32_t n, int flag) void AudioEngine::update_total_latency (const Port& port) { - if (!_jack) { - fatal << _("update_total_latency() called with no JACK client connection") << endmsg; - /*NOTREACHED*/ - } - - if (!_running) { - if (!_has_run) { - fatal << _("update_total_latency() called before engine was started") << endmsg; - /*NOTREACHED*/ - } - } - port.recompute_total_latency (); } void AudioEngine::transport_stop () { - if (_jack) { - jack_transport_stop (_jack); - } + GET_PRIVATE_JACK_POINTER (_jack); + jack_transport_stop (_priv_jack); } void AudioEngine::transport_start () { - if (_jack) { - jack_transport_start (_jack); - } + GET_PRIVATE_JACK_POINTER (_jack); + jack_transport_start (_priv_jack); } void AudioEngine::transport_locate (nframes_t where) { + GET_PRIVATE_JACK_POINTER (_jack); // cerr << "tell JACK to locate to " << where << endl; - if (_jack) { - jack_transport_locate (_jack, where); - } + jack_transport_locate (_priv_jack, where); } AudioEngine::TransportState AudioEngine::transport_state () { - if (_jack) { - jack_position_t pos; - return (TransportState) jack_transport_query (_jack, &pos); - } else { - return (TransportState) JackTransportStopped; - } + GET_PRIVATE_JACK_POINTER_RET (_jack, ((TransportState) JackTransportStopped)); + jack_position_t pos; + return (TransportState) jack_transport_query (_priv_jack, &pos); } int AudioEngine::reset_timebase () { - if (_jack && session) { + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (session) { if (session->config.get_jack_time_master()) { - return jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); + return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this); } else { return jack_release_timebase (_jack); } - } else { - return -1; } + return 0; } int AudioEngine::freewheel (bool onoff) { - if (_jack) { - - if (onoff != _freewheeling) { - - if (onoff) { - _freewheel_thread_registered = false; - } - - return jack_set_freewheel (_jack, onoff); - - } else { - /* already doing what has been asked for */ - return 0; - } + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (onoff != _freewheeling) { + + if (onoff) { + _freewheel_thread_registered = false; + } + + return jack_set_freewheel (_priv_jack, onoff); + } else { - return -1; + /* already doing what has been asked for */ + return 0; } } @@ -1135,32 +1108,21 @@ AudioEngine::remove_all_ports () { RCUWriter writer (ports); boost::shared_ptr ps = writer.get_copy (); - ps->clear (); - } -} -void -AudioEngine::remove_connections_for (Port& port) -{ - for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ) { - PortConnections::iterator tmp; - - tmp = i; - ++tmp; - - if ((*i).first == port.name()) { - port_connections.erase (i); + for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) { + delete *i; } - i = tmp; + ps->clear (); } -} + /* clear dead wood list too */ -#ifdef HAVE_JACK_CLIENT_OPEN + ports.flush (); +} -static void -ardour_jack_error (const char* msg) +static void +ardour_jack_error (const char* msg) { error << "JACK: " << msg << endmsg; } @@ -1180,45 +1142,29 @@ AudioEngine::connect_to_jack (string client_name) return -1; } + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (status & JackNameNotUnique) { - jack_client_name = jack_get_client_name (_jack); + jack_client_name = jack_get_client_name (_priv_jack); } jack_set_error_function (ardour_jack_error); - - return 0; -} - -#else - -int -AudioEngine::connect_to_jack (string client_name) -{ - jack_client_name = client_name; - - if ((_jack = jack_client_new (client_name.c_str())) == 0) { - return -1; - } return 0; } -#endif /* HAVE_JACK_CLIENT_OPEN */ - -int +int AudioEngine::disconnect_from_jack () { - if (!_jack) { - return 0; - } + GET_PRIVATE_JACK_POINTER_RET (_jack, 0); if (_running) { stop_metering_thread (); } - { + { Glib::Mutex::Lock lm (_process_lock); - jack_client_close (_jack); + jack_client_close (_priv_jack); _jack = 0; } @@ -1255,44 +1201,45 @@ AudioEngine::reconnect_to_jack () for (i = p->begin(); i != p->end(); ++i) { if ((*i)->reestablish ()) { break; - } + } } if (i != p->end()) { /* failed */ remove_all_ports (); return -1; - } + } + GET_PRIVATE_JACK_POINTER_RET (_jack,-1); if (session) { - session->reset_jack_connection (_jack); - nframes_t blocksize = jack_get_buffer_size (_jack); + session->reset_jack_connection (_priv_jack); + nframes_t blocksize = jack_get_buffer_size (_priv_jack); session->set_block_size (blocksize); - session->set_frame_rate (jack_get_sample_rate (_jack)); - + session->set_frame_rate (jack_get_sample_rate (_priv_jack)); + _raw_buffer_sizes[DataType::AUDIO] = blocksize * sizeof(float); cout << "FIXME: Assuming maximum MIDI buffer size " << blocksize * 4 << "bytes" << endl; _raw_buffer_sizes[DataType::MIDI] = blocksize * 4; } last_monitor_check = 0; - - jack_on_shutdown (_jack, halted, this); - jack_set_graph_order_callback (_jack, _graph_order_callback, this); - jack_set_thread_init_callback (_jack, _thread_init_callback, this); - jack_set_process_callback (_jack, _process_callback, this); - jack_set_sample_rate_callback (_jack, _sample_rate_callback, this); - jack_set_buffer_size_callback (_jack, _bufsize_callback, this); - jack_set_xrun_callback (_jack, _xrun_callback, this); - jack_set_sync_callback (_jack, _jack_sync_callback, this); - jack_set_freewheel_callback (_jack, _freewheel_callback, this); - + + jack_on_shutdown (_priv_jack, halted, this); + jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this); + jack_set_thread_init_callback (_priv_jack, _thread_init_callback, this); + jack_set_process_callback (_priv_jack, _process_callback, this); + jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this); + jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this); + jack_set_xrun_callback (_priv_jack, _xrun_callback, this); + jack_set_sync_callback (_priv_jack, _jack_sync_callback, this); + jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this); + if (session && session->config.get_jack_time_master()) { - jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); - } - - if (jack_activate (_jack) == 0) { + jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this); + } + + if (jack_activate (_priv_jack) == 0) { _running = true; _has_run = true; } else { @@ -1300,7 +1247,7 @@ AudioEngine::reconnect_to_jack () } /* re-establish connections */ - + for (i = p->begin(); i != p->end(); ++i) { (*i)->reconnect (); } @@ -1315,35 +1262,30 @@ AudioEngine::reconnect_to_jack () int AudioEngine::request_buffer_size (nframes_t nframes) { - if (_jack) { - - if (nframes == jack_get_buffer_size (_jack)) { - return 0; - } - - return jack_set_buffer_size (_jack, nframes); + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); - } else { - return -1; + if (nframes == jack_get_buffer_size (_priv_jack)) { + return 0; } + + return jack_set_buffer_size (_priv_jack, nframes); } void AudioEngine::update_total_latencies () { #ifdef HAVE_JACK_RECOMPUTE_LATENCIES - if (_jack) { - jack_recompute_total_latencies (_jack); - } + GET_PRIVATE_JACK_POINTER (_jack); + jack_recompute_total_latencies (_priv_jack); #endif } - + string AudioEngine::make_port_name_relative (string portname) { string::size_type len; string::size_type n; - + len = portname.length(); for (n = 0; n < len; ++n) { @@ -1351,7 +1293,7 @@ AudioEngine::make_port_name_relative (string portname) break; } } - + if ((n != len) && (portname.substr (0, n) == jack_client_name)) { return portname.substr (n+1); } @@ -1371,16 +1313,13 @@ AudioEngine::make_port_name_non_relative (string portname) str = jack_client_name; str += ':'; str += portname; - + return str; } bool AudioEngine::is_realtime () const { - if (_jack) { - return jack_is_realtime (_jack); - } else { - return false; - } + GET_PRIVATE_JACK_POINTER_RET (_jack,false); + return jack_is_realtime (_priv_jack); }