#include <jack/weakjack.h>
#include "midi++/port.h"
+#include "midi++/jack_midi_port.h"
#include "midi++/mmc.h"
#include "midi++/manager.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/event_type_map.h"
-#include "ardour/internal_return.h"
#include "ardour/internal_send.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/process_thread.h"
#include "ardour/session.h"
-#include "ardour/timestamps.h"
-#include "ardour/utils.h"
#include "i18n.h"
#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, string session_uuid)
- : ports (new Ports)
+ : _jack (0)
+ , session_remove_pending (false)
+ , session_removal_countdown (-1)
+ , _running (false)
+ , _has_run (false)
+ , _buffer_size (0)
+ , _frame_rate (0)
+ , monitor_check_interval (INT32_MAX)
+ , last_monitor_check (0)
+ , _processed_frames (0)
+ , _freewheeling (false)
+ , _pre_freewheel_mmc_enabled (false)
+ , _usecs_per_cycle (0)
+ , port_remove_in_progress (false)
+ , m_meter_thread (0)
+ , _main_thread (0)
+ , ports (new Ports)
{
_instance = this; /* singleton */
- session_remove_pending = false;
- _running = false;
- _has_run = false;
- last_monitor_check = 0;
- monitor_check_interval = INT32_MAX;
- _processed_frames = 0;
- _usecs_per_cycle = 0;
- _jack = 0;
- _frame_rate = 0;
- _buffer_size = 0;
- _freewheeling = false;
- _pre_freewheel_mmc_enabled = false;
- _main_thread = 0;
- port_remove_in_progress = false;
-
- m_meter_thread = 0;
g_atomic_int_set (&m_meter_exit, 0);
if (connect_to_jack (client_name, session_uuid)) {
AudioEngine::~AudioEngine ()
{
+ config_connection.disconnect ();
+
{
- Glib::Mutex::Lock tm (_process_lock);
+ Glib::Threads::Mutex::Lock tm (_process_lock);
session_removed.signal ();
if (_running) {
SessionEvent::create_per_thread_pool (X_("Audioengine"), 512);
- MIDI::Port::set_process_thread (pthread_self());
+ MIDI::JackMIDIPort::set_process_thread (pthread_self());
}
static void
} else {
jack_deactivate (_priv_jack);
Stopped(); /* EMIT SIGNAL */
- MIDI::Port::JackHalted (); /* EMIT SIGNAL */
+ MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
}
}
AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
{
AudioEngine* ae = static_cast<AudioEngine*> (arg);
+ ae->connect_callback (id_a, id_b, conn);
+}
- if (ae->port_remove_in_progress) {
+void
+AudioEngine::connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn)
+{
+ if (port_remove_in_progress) {
return;
}
- GET_PRIVATE_JACK_POINTER (ae->_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
jack_port_t* jack_port_a = jack_port_by_id (_priv_jack, id_a);
jack_port_t* jack_port_b = jack_port_by_id (_priv_jack, id_b);
boost::shared_ptr<Port> port_a;
boost::shared_ptr<Port> port_b;
+ Ports::iterator x;
+ boost::shared_ptr<Ports> pr = ports.reader ();
- boost::shared_ptr<Ports> pr = ae->ports.reader ();
- Ports::iterator i = pr->begin ();
- while (i != pr->end() && (port_a == 0 || port_b == 0)) {
- if (jack_port_a == i->second->jack_port()) {
- port_a = i->second;
- } else if (jack_port_b == i->second->jack_port()) {
- port_b = i->second;
- }
- ++i;
+
+ x = pr->find (make_port_name_relative (jack_port_name (jack_port_a)));
+ if (x != pr->end()) {
+ port_a = x->second;
}
- ae->PortConnectedOrDisconnected (
+ x = pr->find (make_port_name_relative (jack_port_name (jack_port_b)));
+ if (x != pr->end()) {
+ port_b = x->second;
+ }
+
+ PortConnectedOrDisconnected (
port_a, jack_port_name (jack_port_a),
port_b, jack_port_name (jack_port_b),
conn == 0 ? false : true
AudioEngine::process_callback (pframes_t nframes)
{
GET_PRIVATE_JACK_POINTER_RET(_jack,0);
- Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);
+ Glib::Threads::Mutex::Lock tm (_process_lock, Glib::Threads::TRY_LOCK);
PT_TIMING_REF;
PT_TIMING_CHECK (1);
return 0;
}
+ if (session_remove_pending) {
+
+ /* perform the actual session removal */
+
+ if (session_removal_countdown < 0) {
+
+ /* fade out over 1 second */
+ session_removal_countdown = _frame_rate/2;
+ session_removal_gain = 1.0;
+ session_removal_gain_step = 1.0/session_removal_countdown;
+
+ } else if (session_removal_countdown > 0) {
+
+ /* we'll be fading audio out.
+
+ if this is the last time we do this as part
+ of session removal, do a MIDI panic now
+ to get MIDI stopped. This relies on the fact
+ that "immediate data" (aka "out of band data") from
+ MIDI tracks is *appended* after any other data,
+ so that it emerges after any outbound note ons, etc.
+ */
+
+ if (session_removal_countdown <= nframes) {
+ _session->midi_panic ();
+ }
+
+ } else {
+ /* fade out done */
+ _session = 0;
+ session_removal_countdown = -1; // reset to "not in progress"
+ session_remove_pending = false;
+ session_removed.signal(); // wakes up thread that initiated session removal
+ }
+ }
+
if (_session == 0) {
+
if (!_freewheeling) {
MIDI::Manager::instance()->cycle_start(nframes);
MIDI::Manager::instance()->cycle_end();
}
- _processed_frames = next_processed_frames;
- return 0;
- }
- if (session_remove_pending) {
- /* perform the actual session removal */
- _session = 0;
- session_remove_pending = false;
- session_removed.signal();
_processed_frames = next_processed_frames;
+
return 0;
}
if (_session->silent()) {
- boost::shared_ptr<Ports> p = ports.reader();
-
for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
if (i->second->sends_output()) {
}
}
+ if (session_remove_pending && session_removal_countdown) {
+
+ for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+
+ if (i->second->sends_output()) {
+
+ boost::shared_ptr<AudioPort> ap = boost::dynamic_pointer_cast<AudioPort> (i->second);
+ if (ap) {
+ Sample* s = ap->engine_get_whole_audio_buffer ();
+ gain_t g = session_removal_gain;
+
+ for (pframes_t n = 0; n < nframes; ++n) {
+ *s++ *= g;
+ g -= session_removal_gain_step;
+ }
+ }
+ }
+ }
+
+ if (session_removal_countdown > nframes) {
+ session_removal_countdown -= nframes;
+ } else {
+ session_removal_countdown = 0;
+ }
+
+ session_removal_gain -= (nframes * session_removal_gain_step);
+ }
+
// Finalize ports
for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
}
{
- Glib::Mutex::Lock lm (_process_lock);
+ Glib::Threads::Mutex::Lock lm (_process_lock);
boost::shared_ptr<Ports> p = ports.reader();
{
if (m_meter_thread == 0) {
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);
+ m_meter_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::meter_thread, this));
}
}
void
AudioEngine::set_session (Session *s)
{
- Glib::Mutex::Lock pl (_process_lock);
+ Glib::Threads::Mutex::Lock pl (_process_lock);
SessionHandlePtr::set_session (s);
void
AudioEngine::remove_session ()
{
- Glib::Mutex::Lock lm (_process_lock);
+ Glib::Threads::Mutex::Lock lm (_process_lock);
if (_running) {
if (was_running) {
ae->Halted(""); /* EMIT SIGNAL */
- MIDI::Port::JackHalted (); /* EMIT SIGNAL */
+ MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
}
}
{
EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
- jack_options_t options = JackNullOption;
jack_status_t status;
- const char *server_name = NULL;
/* revert all environment settings back to whatever they were when ardour started
*/
_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(), JackNullOption, &status, 0);
if (_jack == NULL) {
// error message is not useful here
}
{
- Glib::Mutex::Lock lm (_process_lock);
+ Glib::Threads::Mutex::Lock lm (_process_lock);
jack_client_close (_priv_jack);
_jack = 0;
}
if (_running) {
_running = false;
Stopped(); /* EMIT SIGNAL */
- MIDI::Port::JackHalted (); /* EMIT SIGNAL */
+ MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
}
return 0;
delete _instance;
_instance = 0;
}
+