X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=0058acc7e2cf9080b2edee1894b39c07f4106ad2;hb=d488ce49bb71d99d1f23a30ff6594e2ad759f6fa;hp=3b85ea2147c6fd26129769cd6c5ed9fc813adf36;hpb=a8da89d745c6a7e7d4c20dfcfb16b2537d767428;p=ardour.git diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 3b85ea2147..0058acc7e2 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 @@ -22,25 +22,37 @@ #include #include #include +#include #include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef VST_SUPPORT -#include -#endif - -#include +#include +#include + +#include "pbd/pthread_utils.h" +#include "pbd/stacktrace.h" +#include "pbd/unknown_type.h" + +#include "midi++/jack.h" +#include "midi++/mmc.h" + +#include "ardour/amp.h" +#include "ardour/audio_port.h" +#include "ardour/audioengine.h" +#include "ardour/buffer.h" +#include "ardour/buffer_set.h" +#include "ardour/cycle_timer.h" +#include "ardour/delivery.h" +#include "ardour/event_type_map.h" +#include "ardour/internal_return.h" +#include "ardour/io.h" +#include "ardour/meter.h" +#include "ardour/midi_port.h" +#include "ardour/process_thread.h" +#include "ardour/port.h" +#include "ardour/port_set.h" +#include "ardour/session.h" +#include "ardour/timestamps.h" +#include "ardour/utils.h" #include "i18n.h" @@ -49,40 +61,54 @@ using namespace ARDOUR; using namespace PBD; gint AudioEngine::m_meter_exit; +AudioEngine* AudioEngine::_instance = 0; -static void -ardour_jack_error (const char* msg) -{ - error << "JACK: " << msg << endmsg; -} +#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) +AudioEngine::AudioEngine (string client_name, string session_uuid) : ports (new Ports) { - session = 0; + _instance = this; /* singleton */ + session_remove_pending = false; _running = false; _has_run = false; 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; + _main_thread = 0; m_meter_thread = 0; g_atomic_int_set (&m_meter_exit, 0); - if (connect_to_jack (client_name)) { + if (connect_to_jack (client_name, session_uuid)) { throw NoBackendAvailable (); } - start_metering_thread(); - + Port::set_engine (this); + + // Initialize parameter metadata (e.g. ranges) + Evoral::Parameter p(NullAutomation); + p = EventTypeMap::instance().new_parameter(NullAutomation); + p = EventTypeMap::instance().new_parameter(GainAutomation); + p = EventTypeMap::instance().new_parameter(PanAutomation); + p = EventTypeMap::instance().new_parameter(PluginAutomation); + p = EventTypeMap::instance().new_parameter(SoloAutomation); + p = EventTypeMap::instance().new_parameter(MuteAutomation); + p = EventTypeMap::instance().new_parameter(MidiCCAutomation); + p = EventTypeMap::instance().new_parameter(MidiPgmChangeAutomation); + p = EventTypeMap::instance().new_parameter(MidiPitchBenderAutomation); + p = EventTypeMap::instance().new_parameter(MidiChannelPressureAutomation); + p = EventTypeMap::instance().new_parameter(FadeInAutomation); + p = EventTypeMap::instance().new_parameter(FadeOutAutomation); + p = EventTypeMap::instance().new_parameter(EnvelopeAutomation); + p = EventTypeMap::instance().new_parameter(MidiCCAutomation); } AudioEngine::~AudioEngine () @@ -90,74 +116,136 @@ AudioEngine::~AudioEngine () { Glib::Mutex::Lock tm (_process_lock); session_removed.signal (); - + if (_running) { jack_client_close (_jack); + _jack = 0; } - + stop_metering_thread (); } } +jack_client_t* +AudioEngine::jack() const +{ + return _jack; +} + 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. */ - PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096); + pthread_set_name (X_("audioengine")); + + PBD::notify_gui_about_thread_creation ("gui", pthread_self(), X_("Audioengine"), 4096); + PBD::notify_gui_about_thread_creation ("midiui", pthread_self(), X_("Audioengine"), 128); + + SessionEvent::create_per_thread_pool (X_("Audioengine"), 512); + + MIDI::JACK_MidiPort::set_process_thread (pthread_self()); + MIDI::MachineControl::set_sending_thread (pthread_self ()); +} + +typedef void (*_JackInfoShutdownCallback)(jack_status_t code, const char* reason, void *arg); + +static void (*on_info_shutdown)(jack_client_t*, _JackInfoShutdownCallback, void *); +extern void jack_on_info_shutdown (jack_client_t*, _JackInfoShutdownCallback, void *) __attribute__((weak)); + +static void check_jack_symbols () __attribute__((constructor)); + +void check_jack_symbols () +{ + /* use weak linking to see if we really have various late-model JACK function */ + on_info_shutdown = jack_on_info_shutdown; +} + +static void +ardour_jack_error (const char* msg) +{ + error << "JACK: " << msg << endmsg; } int AudioEngine::start () { + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (!_running) { - if (session) { - 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_block_size (blocksize); + _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. */ - session->process (blocksize); - session->process (blocksize); - session->process (blocksize); - session->process (blocksize); - session->process (blocksize); - session->process (blocksize); - session->process (blocksize); - session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); } _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); - - if (Config->get_jack_time_master()) { - jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); + if (on_info_shutdown) { + jack_on_info_shutdown (_priv_jack, halted_info, this); + } else { + 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_process_thread (_priv_jack, _process_thread, 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); +#ifdef HAVE_JACK_SESSION + if( jack_set_session_callback ) + jack_set_session_callback (_priv_jack, _session_callback, this); +#endif + 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); + jack_set_port_connect_callback (_priv_jack, _connect_callback, this); + + if (_session && _session->config.get_jack_time_master()) { + jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this); } - if (jack_activate (_jack) == 0) { + jack_set_error_function (ardour_jack_error); + + 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; } + + _raw_buffer_sizes[DataType::AUDIO] = blocksize * sizeof(float); + + jack_port_t* midi_port = jack_port_register (_priv_jack, "m", JACK_DEFAULT_MIDI_TYPE, JackPortIsOutput, 0); + if (!midi_port) { + error << _("Cannot create temporary MIDI port to determine MIDI buffer size") << endmsg; + } else { + _raw_buffer_sizes[DataType::MIDI] = jack_midi_max_event_size (jack_port_get_buffer(midi_port, blocksize)); + cerr << "MIDI port buffers = " << _raw_buffer_sizes[DataType::MIDI] << endl; + jack_port_unregister (_priv_jack, midi_port); + } } return _running ? 0 : -1; @@ -166,17 +254,16 @@ 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 */ + MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */ } - Stopped(); /* EMIT SIGNAL */ } return _running ? -1 : 0; @@ -189,15 +276,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; - - (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; + } + } +#else + /* keep gcc happy */ + offset = 0; #endif return false; @@ -214,8 +307,8 @@ void AudioEngine::jack_timebase_callback (jack_transport_state_t state, nframes_t nframes, jack_position_t* pos, int new_position) { - if (_jack && session && session->synced_to_jack()) { - session->jack_timebase_callback (state, nframes, pos, new_position); + if (_jack && _session && _session->synced_to_jack()) { + _session->jack_timebase_callback (state, nframes, pos, new_position); } } @@ -228,8 +321,8 @@ AudioEngine::_jack_sync_callback (jack_transport_state_t state, jack_position_t* int AudioEngine::jack_sync_callback (jack_transport_state_t state, jack_position_t* pos) { - if (_jack && session) { - return session->jack_sync_callback (state, pos); + if (_jack && _session) { + return _session->jack_sync_callback (state, pos); } return true; @@ -239,41 +332,132 @@ int AudioEngine::_xrun_callback (void *arg) { AudioEngine* ae = static_cast (arg); - if (ae->jack()) { + if (ae->connected()) { ae->Xrun (); /* EMIT SIGNAL */ } return 0; } +#ifdef HAVE_JACK_SESSION +void +AudioEngine::_session_callback (jack_session_event_t *event, void *arg) +{ + printf( "helo.... " ); + AudioEngine* ae = static_cast (arg); + if (ae->connected()) { + ae->JackSessionEvent ( event ); /* EMIT SIGNAL */ + } +} +#endif int AudioEngine::_graph_order_callback (void *arg) { AudioEngine* ae = static_cast (arg); - if (ae->jack()) { + if (ae->connected()) { ae->GraphReordered (); /* EMIT SIGNAL */ } return 0; } +/** Wrapped which is called by JACK as its process callback. It is just + * here to get us back into C++ land by calling AudioEngine::process_callback() + * @param nframes Number of frames passed by JACK. + * @param arg User argument passed by JACK, which will be the AudioEngine*. + */ int AudioEngine::_process_callback (nframes_t nframes, void *arg) { return static_cast (arg)->process_callback (nframes); } +void* +AudioEngine::_process_thread (void *arg) +{ + return static_cast (arg)->process_thread (); +} + void 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::_connect_callback (jack_port_id_t /*id_a*/, jack_port_id_t /*id_b*/, int /*conn*/, void* arg) +{ + AudioEngine* ae = static_cast (arg); + ae->PortConnectedOrDisconnected (); /* EMIT SIGNAL */ +} + +void +AudioEngine::split_cycle (nframes_t offset) +{ + /* caller must hold process lock */ + + Port::increment_port_offset (offset); + + /* tell all Ports that we're going to start a new (split) cycle */ + + boost::shared_ptr p = ports.reader(); + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + (*i)->cycle_split (); + } +} + +void +AudioEngine::finish_process_cycle (int status) +{ + GET_PRIVATE_JACK_POINTER(_jack); + jack_cycle_signal (_jack, 0); +} + +void* +AudioEngine::process_thread () +{ + /* JACK doesn't do this for us when we use the wait API + */ + + _thread_init_callback (0); + + _main_thread = new ProcessThread; + + while (1) { + GET_PRIVATE_JACK_POINTER_RET(_jack,0); + jack_nframes_t nframes = jack_cycle_wait (_jack); + + if (process_callback (nframes)) { + cerr << "--- process\n"; + return 0; + } + + finish_process_cycle (0); + } + + return 0; +} + +/** Method called by JACK (via _process_callback) which says that there + * is work to be done. + * @param nframes Number of frames to process. + */ 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) { @@ -281,62 +465,72 @@ AudioEngine::process_callback (nframes_t nframes) } else { next_processed_frames = _processed_frames + nframes; } - - if (!tm.locked() || session == 0) { + + if (!tm.locked() || _session == 0) { + /* return having done nothing */ _processed_frames = next_processed_frames; return 0; } if (session_remove_pending) { - session = 0; + /* perform the actual session removal */ + _session = 0; session_remove_pending = false; session_removed.signal(); _processed_frames = next_processed_frames; return 0; } - if (_freewheeling) { - if (Freewheel (nframes)) { - cerr << "Freewheeling returned non-zero!\n"; - _freewheeling = false; - jack_set_freewheel (_jack, false); - } - return 0; - } + /* tell all relevant objects that we're starting a new cycle */ + + Delivery::CycleStart (nframes); + Port::set_port_offset (0); + InternalReturn::CycleStart (nframes); + + /* tell all Ports that we're starting a new cycle */ boost::shared_ptr p = ports.reader(); - // Prepare ports (ie read data if necessary) for (Ports::iterator i = p->begin(); i != p->end(); ++i) { (*i)->cycle_start (nframes); } - - if (session) { - session->process (nframes); + + if (_freewheeling) { + /* emit the Freewheel signal and stop freewheeling in the event of trouble + */ + boost::optional r = Freewheel (nframes); + if (r.get_value_or (0)) { + jack_set_freewheel (_priv_jack, false); + } + + } else { + if (_session) { + _session->process (nframes); + + } + } + + if (_freewheeling) { + return 0; } if (!_running) { _processed_frames = next_processed_frames; return 0; } - - // Finalize ports (ie write data if necessary) - for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - (*i)->cycle_end (); - } if (last_monitor_check + monitor_check_interval < next_processed_frames) { 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 */ @@ -345,6 +539,26 @@ 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()) { + port->get_buffer(nframes).silence(nframes); + } + } + } + + // Finalize ports + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + (*i)->cycle_end (nframes); + } + _processed_frames = next_processed_frames; return 0; } @@ -360,14 +574,14 @@ 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); + + if (_session) { + _session->set_frame_rate (nframes); } SampleRateChanged (nframes); /* EMIT SIGNAL */ @@ -384,18 +598,45 @@ AudioEngine::_bufsize_callback (nframes_t nframes, void *arg) int AudioEngine::jack_bufsize_callback (nframes_t nframes) { + bool need_midi_size = true; + bool need_audio_size = true; + _buffer_size = nframes; _usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0); last_monitor_check = 0; boost::shared_ptr p = ports.reader(); + /* crude guesses, see below where we try to get the right answers. + + Note that our guess for MIDI deliberatey tries to overestimate + by a little. It would be nicer if we could get the actual + size from a port, but we have to use this estimate in the + event that there are no MIDI ports currently. If there are + the value will be adjusted below. + */ + + _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof (Sample); + _raw_buffer_sizes[DataType::MIDI] = nframes * 4 - (nframes/2); + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + + if (need_audio_size && (*i)->type() == DataType::AUDIO) { + _raw_buffer_sizes[DataType::AUDIO] = (*i)->raw_buffer_size (nframes); + need_audio_size = false; + } + + + if (need_midi_size && (*i)->type() == DataType::MIDI) { + _raw_buffer_sizes[DataType::MIDI] = (*i)->raw_buffer_size (nframes); + need_midi_size = false; + } + (*i)->reset(); } - if (session) { - session->set_block_size (_buffer_size); + if (_session) { + _session->set_block_size (_buffer_size); } return 0; @@ -415,32 +656,37 @@ void AudioEngine::start_metering_thread () { if (m_meter_thread == 0) { - m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), - 500000, true, true, Glib::THREAD_PRIORITY_NORMAL); + g_atomic_int_set (&m_meter_exit, 0); + m_meter_thread = Glib::Thread::create (boost::bind (&AudioEngine::meter_thread, this), + 500000, true, true, Glib::THREAD_PRIORITY_NORMAL); } } void AudioEngine::meter_thread () { + pthread_set_name (X_("meter")); + while (true) { Glib::usleep (10000); /* 1/100th sec interval */ if (g_atomic_int_get(&m_meter_exit)) { break; } - IO::update_meters (); + Metering::Meter (); } } -void +void AudioEngine::set_session (Session *s) { Glib::Mutex::Lock pl (_process_lock); - if (!session) { + SessionHandlePtr::set_session (s); - session = s; + if (_session) { + start_metering_thread (); + nframes_t blocksize = jack_get_buffer_size (_jack); /* page in as much of the session process code as we @@ -448,166 +694,156 @@ AudioEngine::set_session (Session *s) */ boost::shared_ptr p = ports.reader(); - - for (Ports::iterator i = p->begin(); i != p->end(); ++i) + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { (*i)->cycle_start (blocksize); - - s->process (blocksize); - s->process (blocksize); - s->process (blocksize); - s->process (blocksize); - s->process (blocksize); - s->process (blocksize); - s->process (blocksize); - s->process (blocksize); - - for (Ports::iterator i = p->begin(); i != p->end(); ++i) - (*i)->cycle_end (); - + } + + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + _session->process (blocksize); + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + (*i)->cycle_end (blocksize); + } } } -void +void AudioEngine::remove_session () { Glib::Mutex::Lock lm (_process_lock); if (_running) { - if (session) { + stop_metering_thread (); + + if (_session) { session_remove_pending = true; session_removed.wait(_process_lock); } } else { - session = 0; + SessionHandlePtr::set_session (0); } - + remove_all_ports (); } -Port * -AudioEngine::register_input_port (DataType type, const string& portname) +void +AudioEngine::port_registration_failure (const std::string& portname) { - if (!_running) { - if (!_has_run) { - fatal << _("register input port called before engine was started") << endmsg; - /*NOTREACHED*/ - } else { - return 0; - } - } + GET_PRIVATE_JACK_POINTER (_jack); + string full_portname = jack_client_name; + full_portname += ':'; + full_portname += portname; - jack_port_t *p = jack_port_register (_jack, portname.c_str(), type.to_jack_type(), JackPortIsInput, 0); - if (p) { - - Port* newport = 0; - - if (type == DataType::AUDIO) - newport = new AudioPort (p); - else if (type == DataType::MIDI) - newport = new MidiPort (p); - else - throw unknown_type(); - - if (newport != 0) { - RCUWriter writer (ports); - boost::shared_ptr ps = writer.get_copy (); - ps->insert (ps->begin(), newport); - /* writer goes out of scope, forces update */ - } - - return newport; + 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 { - throw PortRegistrationFailure(); + reason = string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with ports if you need this many tracks."), PROGRAM_NAME); } - return 0; + throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str()); } Port * -AudioEngine::register_output_port (DataType type, const string& portname) +AudioEngine::register_port (DataType dtype, const string& portname, bool input) { - if (!_running) { - if (!_has_run) { - fatal << _("register output port called before engine was started") << endmsg; - /*NOTREACHED*/ + Port* newport = 0; + + try { + if (dtype == DataType::AUDIO) { + newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput)); + } else if (dtype == DataType::MIDI) { + newport = new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput)); } else { - return 0; + throw PortRegistrationFailure("unable to create port (unknown type)"); } - } - jack_port_t* p = 0; - - if ((p = jack_port_register (_jack, portname.c_str(), - type.to_jack_type(), JackPortIsOutput, 0)) != 0) { - - Port* newport = 0; - - if (type == DataType::AUDIO) - newport = new AudioPort (p); - else if (type == DataType::MIDI) - newport = new MidiPort (p); - else - throw unknown_type (); - - if (newport != 0) { - RCUWriter writer (ports); - boost::shared_ptr ps = writer.get_copy (); - ps->insert (ps->begin(), newport); - /* writer goes out of scope, forces update */ + 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) { + old_buffer_size = port_buffer_size; } - + + RCUWriter writer (ports); + boost::shared_ptr ps = writer.get_copy (); + ps->insert (ps->begin(), newport); + + /* writer goes out of scope, forces update */ + return newport; - - } else { - throw PortRegistrationFailure (); } - return 0; + catch (PortRegistrationFailure& err) { + throw err; + } catch (std::exception& e) { + throw PortRegistrationFailure(string_compose( + _("unable to create port: %1"), e.what()).c_str()); + } catch (...) { + throw PortRegistrationFailure("unable to create port (unknown error)"); + } } +Port * +AudioEngine::register_input_port (DataType type, const string& portname) +{ + return register_port (type, portname, true); +} + +Port * +AudioEngine::register_output_port (DataType type, const string& portname) +{ + return register_port (type, portname, false); +} -int +int AudioEngine::unregister_port (Port& port) { - if (!_running) { + /* caller must hold process lock */ + + if (!_running) { /* probably happening when the engine has been halted by JACK, in which case, there is nothing we can do here. */ return 0; } - int ret = jack_port_unregister (_jack, port._port); - - if (ret == 0) { - - { - - RCUWriter writer (ports); - boost::shared_ptr ps = writer.get_copy (); + { + RCUWriter writer (ports); + boost::shared_ptr ps = writer.get_copy (); - for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) { - if ((*i) == &port) { - ps->erase (i); - break; - } + for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) { + if ((*i) == &port) { + delete *i; + ps->erase (i); + break; } - - /* writer goes out of scope, forces update */ } - remove_connections_for (port); + /* writer goes out of scope, forces update */ } - return ret; + return 0; } -int +int AudioEngine::connect (const string& source, const string& destination) { + /* caller must hold process lock */ + + int ret; + if (!_running) { if (!_has_run) { fatal << _("connect called before engine was started") << endmsg; @@ -616,31 +852,41 @@ AudioEngine::connect (const string& source, const string& destination) return -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()); - if (ret == 0) { - pair c (s, d); - port_connections.push_back (c); - } else if (ret == EEXIST) { - error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"), - source, s, destination, d) - << endmsg; + Port* src = get_port_by_name_locked (s); + Port* dst = get_port_by_name_locked (d); + + if (src) { + ret = src->connect (d); + } else if (dst) { + ret = dst->connect (s); } else { - error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), - source, s, destination, d) + /* neither port is known to us, and this API isn't intended for use as a general patch bay */ + ret = -1; + } + + if (ret > 0) { + /* 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) << endmsg; } return ret; } -int +int AudioEngine::disconnect (const string& source, const string& destination) { + /* caller must hold process lock */ + + int ret; + if (!_running) { if (!_has_run) { fatal << _("disconnect called before engine was started") << endmsg; @@ -649,27 +895,29 @@ 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); - int ret = jack_disconnect (_jack, s.c_str(), d.c_str()); + Port* src = get_port_by_name_locked (s); + Port* dst = get_port_by_name_locked (d); - if (ret == 0) { - pair c (s, d); - PortConnections::iterator i; - - if ((i = find (port_connections.begin(), port_connections.end(), c)) != port_connections.end()) { - port_connections.erase (i); - } + if (src) { + ret = src->disconnect (d); + } else if (dst) { + ret = dst->disconnect (s); + } else { + /* neither port is known to us, and this API isn't intended for use as a general patch bay */ + ret = -1; } - return ret; } 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; @@ -679,72 +927,82 @@ AudioEngine::disconnect (Port& port) } } - int ret = jack_port_disconnect (_jack, port._port); - - if (ret == 0) { - remove_connections_for (port); - } - - return ret; - + return port.disconnect_all (); } ARDOUR::nframes_t -AudioEngine::frame_rate () +AudioEngine::frame_rate () const { - 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; } } +size_t +AudioEngine::raw_buffer_size (DataType t) +{ + std::map::const_iterator s = _raw_buffer_sizes.find(t); + return (s != _raw_buffer_sizes.end()) ? s->second : 0; +} + ARDOUR::nframes_t -AudioEngine::frames_per_cycle () +AudioEngine::frames_per_cycle () const { - 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; } } -/** Get a port by name. - * Note this can return NULL, it will NOT create a port if it is not found (any more). +/** @param name Full name of port (including prefix:) + * @return Corresponding Port*, or 0. This object remains the property of the AudioEngine + * so must not be deleted. */ Port * -AudioEngine::get_port_by_name (const string& portname, bool keep) +AudioEngine::get_port_by_name (const string& portname) { + 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 (s); +} + +Port * +AudioEngine::get_port_by_name_locked (const string& portname) +{ + /* caller must hold process lock */ if (!_running) { if (!_has_run) { - fatal << _("get_port_by_name() called before engine was started") << endmsg; + fatal << _("get_port_by_name_locked() called before engine was started") << endmsg; /*NOTREACHED*/ } else { return 0; } } - + + if (portname.substr (0, jack_client_name.length ()) != jack_client_name) { + /* not an ardour: port */ + return 0; + } + + std::string const rel = make_port_name_relative (portname); + boost::shared_ptr pr = ports.reader(); - + for (Ports::iterator i = pr->begin(); i != pr->end(); ++i) { - if (portname == (*i)->name()) { - return (*i); + if (rel == (*i)->name()) { + return *i; } } @@ -754,6 +1012,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; @@ -762,80 +1021,150 @@ 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_info (jack_status_t code, const char* reason, 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; + + if (was_running) { +#ifdef HAVE_JACK_ON_INFO_SHUTDOWN + switch (code) { + case JackBackendError: + ae->Halted(reason); /* EMIT SIGNAL */ + break; + default: + ae->Halted(""); /* EMIT SIGNAL */ + } +#else + ae->Halted(""); /* EMIT SIGNAL */ +#endif + } } void AudioEngine::halted (void *arg) { + cerr << "HALTED by JACK\n"; + + /* 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->_jack = 0; - ae->Halted(); /* EMIT SIGNAL */ + if (was_running) { + ae->Halted(""); /* EMIT SIGNAL */ + MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */ + } } -uint32_t -AudioEngine::n_physical_outputs () const +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; - uint32_t i = 0; - if (!_jack) { - return 0; + if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) { + return false; } - if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) { - return 0; - } + free (ports); - if (ports) { - for (i = 0; ports[i]; ++i); - free (ports); - } - return i; + return true; } + uint32_t -AudioEngine::n_physical_inputs () const +AudioEngine::n_physical_outputs (DataType type) const { + GET_PRIVATE_JACK_POINTER_RET (_jack,0); const char ** ports; - uint32_t i = 0; - - if (!_jack) { + uint32_t cnt = 0; + + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) { return 0; } - - if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) { + + for (uint32_t i = 0; ports[i]; ++i) { + if (!strstr (ports[i], "Midi-Through")) { + cnt++; + } + } + + free (ports); + + return cnt; +} + +uint32_t +AudioEngine::n_physical_inputs (DataType type) const +{ + GET_PRIVATE_JACK_POINTER_RET (_jack,0); + const char ** ports; + uint32_t cnt = 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); - } - return i; + for (uint32_t i = 0; ports[i]; ++i) { + if (!strstr (ports[i], "Midi-Through")) { + cnt++; + } + } + + free (ports); + + return cnt; } void -AudioEngine::get_physical_inputs (vector& ins) +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, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) { + + if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) { return; } if (ports) { - for (i = 0; ports[i]; ++i) { + for (uint32_t i = 0; ports[i]; ++i) { + if (strstr (ports[i], "Midi-Through")) { + continue; + } ins.push_back (ports[i]); } free (ports); @@ -843,145 +1172,116 @@ AudioEngine::get_physical_inputs (vector& ins) } void -AudioEngine::get_physical_outputs (vector& outs) +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, NULL, 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) { + if (strstr (ports[i], "Midi-Through")) { + continue; + } + 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; + uint32_t idx; 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); + for (i = 0, idx = 0; idx < n && ports[i]; ++i) { + if (!strstr (ports[i], "Midi-Through")) { + ++idx; + } + } - if (ports[i]) { - ret = ports[i]; + if (ports[idx]) { + ret = ports[idx]; } - free ((char *) ports); + free ((const char **) ports); return ret; } -ARDOUR::nframes_t -AudioEngine::get_port_total_latency (const Port& port) +void +AudioEngine::update_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*/ - } - } - - return jack_port_get_total_latency (_jack, port._port); + port.recompute_total_latency (); } 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); + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (_session) { + if (_session->config.get_jack_time_master()) { + 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) { - _freewheel_thread_registered = false; - } - - return jack_set_freewheel (_jack, onoff); + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); + if (onoff != _freewheeling) { + return jack_set_freewheel (_priv_jack, onoff); + } else { - return -1; + /* already doing what has been asked for */ + return 0; } } @@ -990,123 +1290,89 @@ AudioEngine::remove_all_ports () { /* process lock MUST be held */ - if (_jack) { - boost::shared_ptr p = ports.reader(); - - for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - jack_port_unregister (_jack, (*i)->_port); - } - } - { RCUWriter writer (ports); boost::shared_ptr ps = writer.get_copy (); - ps->clear (); - } - port_connections.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 (); } -} -#ifdef HAVE_JACK_CLIENT_OPEN + /* clear dead wood list too */ + + ports.flush (); +} int -AudioEngine::connect_to_jack (string client_name) +AudioEngine::connect_to_jack (string client_name, string session_uuid) { jack_options_t options = JackNullOption; jack_status_t status; const char *server_name = NULL; jack_client_name = client_name; /* might be reset below */ +#ifdef HAVE_JACK_SESSION + if (! session_uuid.empty()) + _jack = jack_client_open (jack_client_name.c_str(), JackSessionID, &status, session_uuid.c_str()); + else +#endif + _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name); - _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; + // error message is not useful here return -1; } - if (status & JackServerStarted) { - info << _("JACK server started") << endmsg; - } + 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) +AudioEngine::disconnect_from_jack () { - jack_client_name = client_name; + GET_PRIVATE_JACK_POINTER_RET (_jack, 0); - if ((_jack = jack_client_new (client_name.c_str())) == NULL) { - return -1; + if (_running) { + stop_metering_thread (); } - return 0; -} - -#endif /* HAVE_JACK_CLIENT_OPEN */ - -int -AudioEngine::disconnect_from_jack () -{ - if (_jack == 0) { - return 0; + { + Glib::Mutex::Lock lm (_process_lock); + jack_client_close (_priv_jack); + _jack = 0; } - jack_client_close (_jack); - _buffer_size = 0; _frame_rate = 0; + _raw_buffer_sizes.clear(); if (_running) { _running = false; Stopped(); /* EMIT SIGNAL */ + MIDI::JACK_MidiPort::JackHalted (); /* 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); } - if (connect_to_jack (jack_client_name)) { + if (connect_to_jack (jack_client_name, "")) { error << _("failed to connect to JACK") << endmsg; return -1; } @@ -1116,60 +1382,47 @@ AudioEngine::reconnect_to_jack () boost::shared_ptr p = ports.reader (); for (i = p->begin(); i != p->end(); ++i) { - - /* XXX hack hack hack */ - - string long_name = (*i)->name(); - string short_name; - - short_name = long_name.substr (long_name.find_last_of (':') + 1); - - if (((*i)->_port = jack_port_register (_jack, short_name.c_str(), (*i)->type().to_jack_type(), (*i)->flags(), 0)) == 0) { - error << string_compose (_("could not reregister %1"), (*i)->name()) << endmsg; + if ((*i)->reestablish ()) { break; - } else { - } - - (*i)->reset (); - - if ((*i)->flags() & JackPortIsOutput) { - (*i)->get_buffer().silence (jack_get_buffer_size (_jack), 0); } } if (i != p->end()) { /* failed */ - for (Ports::iterator i = p->begin(); i != p->end(); ++i) { - jack_port_unregister (_jack, (*i)->_port); - } + 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->set_block_size (blocksize); - session->set_frame_rate (jack_get_sample_rate (_jack)); + if (_session) { + _session->reset_jack_connection (_priv_jack); + jack_bufsize_callback (jack_get_buffer_size (_priv_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); - - if (Config->get_jack_time_master()) { - jack_set_timebase_callback (_jack, 0, _jack_timebase_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_process_thread (_priv_jack, _process_thread, 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); +#ifdef HAVE_JACK_SESSION + if( jack_set_session_callback ) + jack_set_session_callback (_priv_jack, _session_callback, this); +#endif + 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 (_priv_jack, 0, _jack_timebase_callback, this); } - - if (jack_activate (_jack) == 0) { + + if (jack_activate (_priv_jack) == 0) { _running = true; _has_run = true; } else { @@ -1177,55 +1430,45 @@ AudioEngine::reconnect_to_jack () } /* re-establish connections */ - - for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ++i) { - - int err; - - if ((err = jack_connect (_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) - << endmsg; - } - } + + for (i = p->begin(); i != p->end(); ++i) { + (*i)->reconnect (); } Running (); /* EMIT SIGNAL*/ + start_metering_thread (); + return 0; } int AudioEngine::request_buffer_size (nframes_t nframes) { - if (_jack) { + GET_PRIVATE_JACK_POINTER_RET (_jack, -1); - if (nframes == jack_get_buffer_size (_jack)) { - return 0; - } - - return jack_set_buffer_size (_jack, nframes); - - } 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 } - + 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) { @@ -1233,7 +1476,7 @@ AudioEngine::make_port_name_relative (string portname) break; } } - + if ((n != len) && (portname.substr (0, n) == jack_client_name)) { return portname.substr (n+1); } @@ -1253,16 +1496,40 @@ 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); +} + +pthread_t +AudioEngine::create_process_thread (boost::function f, size_t stacksize) +{ + GET_PRIVATE_JACK_POINTER_RET (_jack, 0); + pthread_t thread; + ThreadData* td = new ThreadData (this, f, stacksize); + + if (jack_client_create_thread (_priv_jack, &thread, jack_client_real_time_priority (_priv_jack), + jack_is_realtime (_priv_jack), _start_process_thread, td)) { + return -1; + } + + return thread; +} + +void* +AudioEngine::_start_process_thread (void* arg) +{ + ThreadData* td = reinterpret_cast (arg); + boost::function f = td->f; + delete td; + + f (); + + return 0; }