X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=ae8d7bf5f5ffd331bf447e30c2232dfec71c0df8;hb=5a3a2fad4fd1c217a5771caa64efe92a0b305275;hp=457c68ce3b4543a4d62e7c08e77856001f969003;hpb=e96e4bacbeadd832e9deb251d91124eb012a5a49;p=ardour.git diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 457c68ce3b..ae8d7bf5f5 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -28,12 +29,10 @@ #include #include #include +#include #include #include #include -#ifdef VST_SUPPORT -#include -#endif #include @@ -44,16 +43,23 @@ using namespace ARDOUR; using namespace PBD; gint AudioEngine::m_meter_exit; +AudioEngine* AudioEngine::_instance = 0; + +#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; } static void ardour_jack_error (const char* msg) { - error << "JACK: " << msg << endmsg; + // throw JACK errors away - they cause visual clutter + // error << "JACK: " << msg << endmsg; } AudioEngine::AudioEngine (string client_name) : ports (new Ports) { + _instance = this; /* singleton */ + session = 0; session_remove_pending = false; _running = false; @@ -61,13 +67,12 @@ AudioEngine::AudioEngine (string client_name) last_monitor_check = 0; monitor_check_interval = max_frames; _processed_frames = 0; - _freewheeling = false; _usecs_per_cycle = 0; _jack = 0; _frame_rate = 0; _buffer_size = 0; - _freewheeling = false; _freewheel_thread_registered = false; + _freewheeling = false; m_meter_thread = 0; g_atomic_int_set (&m_meter_exit, 0); @@ -75,9 +80,6 @@ AudioEngine::AudioEngine (string client_name) if (connect_to_jack (client_name)) { throw NoBackendAvailable (); } - - start_metering_thread(); - } AudioEngine::~AudioEngine () @@ -88,6 +90,7 @@ AudioEngine::~AudioEngine () if (_running) { jack_client_close (_jack); + _jack = 0; } stop_metering_thread (); @@ -101,19 +104,25 @@ _thread_init_callback (void *arg) knows about it. */ - PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096); + PBD::notify_gui_about_thread_creation (pthread_self(), X_("Audioengine"), 4096); } int AudioEngine::start () { + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (!_running) { + nframes_t blocksize = jack_get_buffer_size (_priv_jack); + Port::set_buffer_size (blocksize); + if (session) { - nframes_t blocksize = jack_get_buffer_size (_jack); + + 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. @@ -132,27 +141,29 @@ 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); if (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 */ } else { - error << _("cannot activate JACK client") << endmsg; + // error << _("cannot activate JACK client") << endmsg; } + + start_metering_thread(); } return _running ? 0 : -1; @@ -161,17 +172,15 @@ AudioEngine::start () int AudioEngine::stop (bool forever) { - if (_running) { - _running = false; + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + + if (_priv_jack) { if (forever) { - jack_client_t* foo = _jack; - _jack = 0; - jack_client_close (foo); - stop_metering_thread (); + disconnect_from_jack (); } else { - jack_deactivate (_jack); + jack_deactivate (_priv_jack); + Stopped(); /* EMIT SIGNAL */ } - Stopped(); /* EMIT SIGNAL */ } return _running ? -1 : 0; @@ -184,13 +193,17 @@ AudioEngine::get_sync_offset (nframes_t& offset) const #ifdef HAVE_JACK_VIDEO_SUPPORT + GET_PRIVATE_JACK_POINTER_RET (_jack, false); + jack_position_t pos; - (void) jack_transport_query (_jack, &pos); - - if (pos.valid & JackVideoFrameOffset) { - offset = pos.video_offset; - return true; + if (_priv_jack) { + (void) jack_transport_query (_priv_jack, &pos); + + if (pos.valid & JackVideoFrameOffset) { + offset = pos.video_offset; + return true; + } } #endif @@ -234,7 +247,7 @@ int AudioEngine::_xrun_callback (void *arg) { AudioEngine* ae = static_cast (arg); - if (ae->jack()) { + if (ae->connected()) { ae->Xrun (); /* EMIT SIGNAL */ } return 0; @@ -244,7 +257,7 @@ int AudioEngine::_graph_order_callback (void *arg) { AudioEngine* ae = static_cast (arg); - if (ae->jack()) { + if (ae->connected()) { ae->GraphReordered (); /* EMIT SIGNAL */ } return 0; @@ -266,6 +279,7 @@ int AudioEngine::process_callback (nframes_t nframes) { // CycleTimer ct ("AudioEngine::process"); + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK); nframes_t next_processed_frames; @@ -290,11 +304,17 @@ AudioEngine::process_callback (nframes_t nframes) return 0; } + /* reset port buffer offset for the start of a new cycle */ + + Port::set_port_offset (0); + + /* tell all IO objects that we're starting a new cycle */ + + IO::CycleStart (nframes); + if (_freewheeling) { if (Freewheel (nframes)) { - cerr << "Freewheeling returned non-zero!\n"; - _freewheeling = false; - jack_set_freewheel (_jack, false); + jack_set_freewheel (_priv_jack, false); } return 0; } @@ -330,6 +350,23 @@ AudioEngine::process_callback (nframes_t nframes) last_monitor_check = next_processed_frames; } + if (session->silent()) { + + boost::shared_ptr p = ports.reader(); + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + + Port *port = (*i); + + if (port->sends_output()) { + Sample *buf = port->get_buffer (nframes); + memset (buf, 0, sizeof(Sample) * nframes); + // this should work but doesn't + //port->silence(0, nframes); //need to implement declicking fade + } + } + } + _processed_frames = next_processed_frames; return 0; } @@ -373,8 +410,11 @@ AudioEngine::jack_bufsize_callback (nframes_t nframes) _usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0); last_monitor_check = 0; - boost::shared_ptr p = ports.reader(); + cerr << "bufsize: Set Port buffer size to " << nframes << endl; + Port::set_buffer_size (nframes); + boost::shared_ptr p = ports.reader(); + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { (*i)->reset(); } @@ -400,8 +440,9 @@ void AudioEngine::start_metering_thread () { if (m_meter_thread == 0) { + g_atomic_int_set (&m_meter_exit, 0); m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), - 500000, true, true, Glib::THREAD_PRIORITY_NORMAL); + 500000, true, true, Glib::THREAD_PRIORITY_NORMAL); } } @@ -431,7 +472,7 @@ AudioEngine::set_session (Session *s) /* page in as much of the session process code as we can before we really start running. */ - + session->process (blocksize); session->process (blocksize); session->process (blocksize); @@ -462,9 +503,31 @@ AudioEngine::remove_session () 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 (_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_input_port (DataType type, const string& portname) { + GET_PRIVATE_JACK_POINTER_RET (_jack, 0); if (!_running) { if (!_has_run) { fatal << _("register input port called before engine was started") << endmsg; @@ -474,7 +537,7 @@ AudioEngine::register_input_port (DataType type, const string& portname) } } - jack_port_t *p = jack_port_register (_jack, portname.c_str(), type.to_jack_type(), JackPortIsInput, 0); + jack_port_t *p = jack_port_register (_priv_jack, portname.c_str(), type.to_jack_type(), JackPortIsInput, 0); if (p) { @@ -490,7 +553,7 @@ AudioEngine::register_input_port (DataType type, const string& portname) return newport; } else { - throw PortRegistrationFailure(); + port_registration_failure (portname); } return 0; @@ -499,6 +562,8 @@ AudioEngine::register_input_port (DataType type, const string& portname) Port * AudioEngine::register_output_port (DataType type, const string& portname) { + GET_PRIVATE_JACK_POINTER_RET (_jack, 0); + if (!_running) { if (!_has_run) { fatal << _("register output port called before engine was started") << endmsg; @@ -510,7 +575,7 @@ AudioEngine::register_output_port (DataType type, const string& portname) jack_port_t *p; - if ((p = jack_port_register (_jack, portname.c_str(), + if ((p = jack_port_register (_priv_jack, portname.c_str(), type.to_jack_type(), JackPortIsOutput, 0)) != 0) { Port *newport = 0; @@ -528,7 +593,7 @@ AudioEngine::register_output_port (DataType type, const string& portname) return newport; } else { - throw PortRegistrationFailure (); + port_registration_failure (portname); } return 0; @@ -538,6 +603,8 @@ AudioEngine::register_output_port (DataType type, const string& portname) int AudioEngine::unregister_port (Port *port) { + GET_PRIVATE_JACK_POINTER_RET (_jack,-1); + if (!_running) { /* probably happening when the engine has been halted by JACK, in which case, there is nothing we can do here. @@ -547,7 +614,7 @@ AudioEngine::unregister_port (Port *port) if (port) { - int ret = jack_port_unregister (_jack, port->_port); + int ret = jack_port_unregister (_priv_jack, port->_port); if (ret == 0) { @@ -579,19 +646,12 @@ AudioEngine::unregister_port (Port *port) int AudioEngine::connect (const string& source, const string& destination) { - if (!_running) { - if (!_has_run) { - fatal << _("connect called before engine was started") << endmsg; - /*NOTREACHED*/ - } else { - return -1; - } - } + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); string s = make_port_name_non_relative (source); string d = make_port_name_non_relative (destination); - int ret = jack_connect (_jack, s.c_str(), d.c_str()); + int ret = jack_connect (_priv_jack, s.c_str(), d.c_str()); if (ret == 0) { pair c (s, d); @@ -612,6 +672,8 @@ AudioEngine::connect (const string& source, const string& destination) int AudioEngine::disconnect (const string& source, const string& destination) { + GET_PRIVATE_JACK_POINTER_RET (_jack,-1); + if (!_running) { if (!_has_run) { fatal << _("disconnect called before engine was started") << endmsg; @@ -624,7 +686,7 @@ AudioEngine::disconnect (const string& source, const string& destination) string s = make_port_name_non_relative (source); string d = make_port_name_non_relative (destination); - int ret = jack_disconnect (_jack, s.c_str(), d.c_str()); + int ret = jack_disconnect (_priv_jack, s.c_str(), d.c_str()); if (ret == 0) { pair c (s, d); @@ -641,6 +703,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; @@ -650,7 +714,7 @@ AudioEngine::disconnect (Port *port) } } - int ret = jack_port_disconnect (_jack, port->_port); + int ret = jack_port_disconnect (_priv_jack, port->_port); if (ret == 0) { remove_connections_for (port); @@ -663,34 +727,22 @@ AudioEngine::disconnect (Port *port) 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; } } 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; } } @@ -698,6 +750,7 @@ Port * AudioEngine::get_port_by_name (const string& portname, bool keep) { Glib::Mutex::Lock lm (_process_lock); + GET_PRIVATE_JACK_POINTER_RET (_jack,0); if (!_running) { if (!_has_run) { @@ -720,7 +773,7 @@ AudioEngine::get_port_by_name (const string& portname, bool keep) jack_port_t *p; - if ((p = jack_port_by_name (_jack, portname.c_str())) != 0) { + if ((p = jack_port_by_name (_priv_jack, portname.c_str())) != 0) { Port *newport = new Port (p); { @@ -743,6 +796,7 @@ AudioEngine::get_port_by_name (const string& portname, bool keep) 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; @@ -751,128 +805,138 @@ 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; + + ae->stop_metering_thread (); ae->_running = false; ae->_buffer_size = 0; ae->_frame_rate = 0; ae->_jack = 0; - ae->Halted(); /* EMIT SIGNAL */ + if (was_running) { + ae->Halted(); /* EMIT SIGNAL */ + } +} + +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 () +{ + GET_PRIVATE_JACK_POINTER_RET (_jack,false); + const char ** ports; + + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) { + return false; + } + + free (ports); + + return true; +} + + uint32_t -AudioEngine::n_physical_outputs () const +AudioEngine::n_physical_audio_outputs () const { + GET_PRIVATE_JACK_POINTER_RET (_jack,0); const char ** ports; uint32_t i = 0; - if (!_jack) { + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsInput)) == 0) { return 0; } - if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) { - return 0; - } + for (i = 0; ports[i]; ++i); + free (ports); - if (ports) { - for (i = 0; ports[i]; ++i); - free (ports); - } return i; } uint32_t -AudioEngine::n_physical_inputs () const +AudioEngine::n_physical_audio_inputs () 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, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) { + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_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 (vector& ins) +AudioEngine::get_physical_audio_inputs (vector& ins) { + GET_PRIVATE_JACK_POINTER (_jack); const char ** ports; uint32_t i = 0; - if (!_jack) { - return; - } - - if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) { + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput)) == 0) { return; } - if (ports) { - for (i = 0; ports[i]; ++i) { - ins.push_back (ports[i]); - } - free (ports); + for (i = 0; ports[i]; ++i) { + ins.push_back (ports[i]); } + + free (ports); } void -AudioEngine::get_physical_outputs (vector& outs) +AudioEngine::get_physical_audio_outputs (vector& outs) { + GET_PRIVATE_JACK_POINTER (_jack); const char ** ports; uint32_t i = 0; - if (!_jack) { - return; - } - - if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) { + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_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 (uint32_t n, int flag) +AudioEngine::get_nth_physical_audio (uint32_t n, int flag) { + GET_PRIVATE_JACK_POINTER_RET (_jack,""); const char ** ports; uint32_t i; string ret; - 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, NULL, JackPortIsPhysical|flag); - - if (ports == 0) { - return ""; + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|flag)) == 0) { + return ret; } for (i = 0; i < n && ports[i]; ++i); @@ -881,7 +945,7 @@ AudioEngine::get_nth_physical (uint32_t n, int flag) ret = ports[i]; } - free ((char *) ports); + free (ports); return ret; } @@ -889,109 +953,93 @@ AudioEngine::get_nth_physical (uint32_t n, int flag) nframes_t AudioEngine::get_port_total_latency (const Port& port) { - if (!_jack) { - fatal << _("get_port_total_latency() called with no JACK client connection") << endmsg; - /*NOTREACHED*/ - } - - if (!_running) { - if (!_has_run) { - fatal << _("get_port_total_latency() called before engine was started") << endmsg; - /*NOTREACHED*/ - } - } + GET_PRIVATE_JACK_POINTER_RET (_jack,0); - return jack_port_get_total_latency (_jack, port._port); + return jack_port_get_total_latency (_priv_jack, port._port); } void AudioEngine::transport_stop () { - // cerr << "tell JACK to stop\n"; - if (_jack) { - jack_transport_stop (_jack); - } + GET_PRIVATE_JACK_POINTER (_jack); + jack_transport_stop (_priv_jack); } void AudioEngine::transport_start () { - // cerr << "tell JACK to start\n"; - 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) { - if (Config->get_jack_time_master()) { - return jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); - } else { - return jack_release_timebase (_jack); - } + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (Config->get_jack_time_master()) { + return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this); } else { - return -1; + return jack_release_timebase (_jack); } } int AudioEngine::freewheel (bool onoff) { - if (_jack) { - - if (onoff) { - _freewheel_thread_registered = false; - } - - return jack_set_freewheel (_jack, onoff); - + 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; } } void AudioEngine::remove_all_ports () { - /* process lock MUST be held */ - - if (_jack) { - boost::shared_ptr p = ports.reader(); + jack_client_t* _priv_jack = _jack; - for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - jack_port_unregister (_jack, (*i)->_port); - } - } + /* process lock MUST be held */ - { - RCUWriter writer (ports); - boost::shared_ptr ps = writer.get_copy (); - ps->clear (); - } + if (_priv_jack) { - port_connections.clear (); + boost::shared_ptr p = ports.reader(); + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + jack_port_unregister (_priv_jack, (*i)->_port); + } + } + { + RCUWriter writer (ports); + boost::shared_ptr ps = writer.get_copy (); + ps->clear (); + } + + port_connections.clear (); } void @@ -1021,21 +1069,17 @@ AudioEngine::connect_to_jack (string client_name) const char *server_name = NULL; jack_client_name = client_name; /* might be reset below */ - _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name); - - if (_jack == NULL) { - if (status & JackServerFailed) { - error << _("Unable to connect to JACK server") << endmsg; - } - - error << string_compose (_("Could not connect to JACK server as \"%1\""), jack_client_name) << endmsg; + if (_jack == NULL) { + /* just return without an error message. something else will take care of it */ 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); @@ -1050,7 +1094,7 @@ AudioEngine::connect_to_jack (string client_name) { jack_client_name = client_name; - if ((_jack = jack_client_new (client_name.c_str())) == NULL) { + if ((_jack = jack_client_new (client_name.c_str())) == 0) { return -1; } @@ -1062,11 +1106,17 @@ AudioEngine::connect_to_jack (string client_name) int AudioEngine::disconnect_from_jack () { - if (_jack == 0) { - return 0; + GET_PRIVATE_JACK_POINTER_RET (_jack, 0); + + if (_running) { + stop_metering_thread (); } - jack_client_close (_jack); + { + Glib::Mutex::Lock lm (_process_lock); + jack_client_close (_priv_jack); + _jack = 0; + } _buffer_size = 0; _frame_rate = 0; @@ -1076,14 +1126,13 @@ AudioEngine::disconnect_from_jack () Stopped(); /* EMIT SIGNAL */ } - _jack = 0; return 0; } int AudioEngine::reconnect_to_jack () { - if (_jack) { + if (_running) { disconnect_from_jack (); /* XXX give jackd a chance */ Glib::usleep (250000); @@ -1094,8 +1143,13 @@ AudioEngine::reconnect_to_jack () return -1; } - Ports::iterator i; + /* Now that we're connected again, we can get a private + pointer to the jack client. + */ + + GET_PRIVATE_JACK_POINTER_RET (_jack,-1); + Ports::iterator i; boost::shared_ptr p = ports.reader (); for (i = p->begin(); i != p->end(); ++i) { @@ -1107,7 +1161,7 @@ AudioEngine::reconnect_to_jack () short_name = long_name.substr (long_name.find_last_of (':') + 1); - if (((*i)->_port = jack_port_register (_jack, short_name.c_str(), (*i)->type(), (*i)->flags(), 0)) == 0) { + if (((*i)->_port = jack_port_register (_priv_jack, short_name.c_str(), (*i)->type(), (*i)->flags(), 0)) == 0) { error << string_compose (_("could not reregister %1"), (*i)->name()) << endmsg; break; } else { @@ -1116,43 +1170,44 @@ AudioEngine::reconnect_to_jack () (*i)->reset (); if ((*i)->flags() & JackPortIsOutput) { - (*i)->silence (jack_get_buffer_size (_jack), 0); + (*i)->silence (jack_get_buffer_size (_priv_jack)); } } if (i != p->end()) { /* failed */ for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - jack_port_unregister (_jack, (*i)->_port); + jack_port_unregister (_priv_jack, (*i)->_port); } return -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); + Port::set_buffer_size (blocksize); session->set_block_size (blocksize); - session->set_frame_rate (jack_get_sample_rate (_jack)); + session->set_frame_rate (jack_get_sample_rate (_priv_jack)); } 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 (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; } else { @@ -1164,8 +1219,13 @@ AudioEngine::reconnect_to_jack () for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ++i) { int err; + + if (!_jack) { + error << _("Disconnected from JACK while reconnecting. You should quit Ardour now.") << endmsg; + return -1; + } - if ((err = jack_connect (_jack, (*i).first.c_str(), (*i).second.c_str())) != 0) { + if ((err = jack_connect (_priv_jack, (*i).first.c_str(), (*i).second.c_str())) != 0) { if (err != EEXIST) { error << string_compose (_("could not reconnect %1 and %2 (err = %3)"), (*i).first, (*i).second, err) @@ -1176,30 +1236,29 @@ AudioEngine::reconnect_to_jack () Running (); /* EMIT SIGNAL*/ + start_metering_thread (); + return 0; } 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 - jack_recompute_total_latencies (_jack); + GET_PRIVATE_JACK_POINTER (_jack); + jack_recompute_total_latencies (_priv_jack); #endif } @@ -1243,9 +1302,6 @@ AudioEngine::make_port_name_non_relative (string portname) 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); }