#include <sstream>
#include <glibmm/timer.h>
+#include <jack/jack.h>
+#include <jack/thread.h>
+
#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/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"
#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)
{
_instance = this; /* singleton */
- session = 0;
session_remove_pending = false;
_running = false;
_has_run = false;
_jack = 0;
_frame_rate = 0;
_buffer_size = 0;
- _freewheel_thread_registered = false;
_freewheeling = 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 ();
}
knows about it.
*/
- PBD::notify_gui_about_thread_creation (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
int
AudioEngine::start ()
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (!_running) {
nframes_t blocksize = jack_get_buffer_size (_priv_jack);
- if (session) {
+ if (_session) {
BootMessage (_("Connect session to engine"));
- session->set_block_size (blocksize);
- session->set_frame_rate (jack_get_sample_rate (_priv_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 (_priv_jack, halted, 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_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()) {
+ if (_session && _session->config.get_jack_time_master()) {
jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
}
// error << _("cannot activate JACK client") << endmsg;
}
- start_metering_thread();
-
_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;
int
AudioEngine::stop (bool forever)
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (_priv_jack) {
if (forever) {
} else {
jack_deactivate (_priv_jack);
Stopped(); /* EMIT SIGNAL */
+ MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */
}
}
#ifdef HAVE_JACK_VIDEO_SUPPORT
- GET_PRIVATE_JACK_POINTER_RET (_jack, false);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, false);
jack_position_t pos;
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);
}
}
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;
return 0;
}
+#ifdef HAVE_JACK_SESSION
+void
+AudioEngine::_session_callback (jack_session_event_t *event, void *arg)
+{
+ printf( "helo.... " );
+ AudioEngine* ae = static_cast<AudioEngine*> (arg);
+ if (ae->connected()) {
+ ae->JackSessionEvent ( event ); /* EMIT SIGNAL */
+ }
+}
+#endif
int
AudioEngine::_graph_order_callback (void *arg)
{
return static_cast<AudioEngine *> (arg)->process_callback (nframes);
}
+void*
+AudioEngine::_process_thread (void *arg)
+{
+ return static_cast<AudioEngine *> (arg)->process_thread ();
+}
+
void
AudioEngine::_freewheel_callback (int onoff, void *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<AudioEngine*> (arg);
+ ae->PortConnectedOrDisconnected (); /* EMIT SIGNAL */
+}
+
void
AudioEngine::split_cycle (nframes_t offset)
{
}
}
+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)
+ GET_PRIVATE_JACK_POINTER_RET(_jack,0);
// CycleTimer ct ("AudioEngine::process");
Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);
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) {
/* perform the actual session removal */
- session = 0;
+ _session = 0;
session_remove_pending = false;
session_removed.signal();
_processed_frames = next_processed_frames;
}
if (_freewheeling) {
- /* emit the Freewheel signal and stop freewheeling in the event of trouble */
- if (Freewheel (nframes)) {
+ /* emit the Freewheel signal and stop freewheeling in the event of trouble
+ */
+ boost::optional<int> r = Freewheel (nframes);
+ if (r.get_value_or (0)) {
jack_set_freewheel (_priv_jack, false);
}
} else {
- if (session) {
- session->process (nframes);
+ if (_session) {
+ _session->process (nframes);
+
}
}
last_monitor_check = next_processed_frames;
}
- if (session->silent()) {
+ if (_session->silent()) {
boost::shared_ptr<Ports> p = ports.reader();
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 */
int
AudioEngine::jack_bufsize_callback (nframes_t nframes)
{
+ bool need_midi_size = true;
+ bool need_audio_size = true;
+
_buffer_size = nframes;
- _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof(float);
- cout << "FIXME: Assuming maximum MIDI buffer size " << nframes * 4 << "bytes" << endl;
- _raw_buffer_sizes[DataType::MIDI] = nframes * 4;
_usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0);
last_monitor_check = 0;
boost::shared_ptr<Ports> 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;
{
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),
+ 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;
}
- Metering::update_meters ();
+ Metering::Meter ();
}
}
{
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
can before we really start running.
*/
-
+
boost::shared_ptr<Ports> p = ports.reader();
-
+
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);
-
+
+ _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);
}
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 ();
void
AudioEngine::port_registration_failure (const std::string& portname)
{
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
string full_portname = jack_client_name;
full_portname += ':';
full_portname += portname;
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.");
+ 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);
}
throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
Port* dst = get_port_by_name_locked (d);
if (src) {
- ret = src->connect (d);
+ ret = src->connect (d);
} else if (dst) {
- ret = dst->connect (s);
+ ret = dst->connect (s);
} else {
/* neither port is known to us, and this API isn't intended for use as a general patch bay */
ret = -1;
int
AudioEngine::disconnect (Port& port)
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
if (!_running) {
if (!_has_run) {
}
ARDOUR::nframes_t
-AudioEngine::frame_rate ()
+AudioEngine::frame_rate () const
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,0);
if (_frame_rate == 0) {
return (_frame_rate = jack_get_sample_rate (_priv_jack));
} else {
}
ARDOUR::nframes_t
-AudioEngine::frames_per_cycle ()
+AudioEngine::frames_per_cycle () const
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,0);
if (_buffer_size == 0) {
return (_buffer_size = jack_get_buffer_size (_jack));
} else {
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);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,0);
if (!_running) {
if (!_has_run) {
fatal << _("get_ports called before engine was started") << endmsg;
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<AudioEngine *> (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<AudioEngine *> (arg);
ae->_running = false;
ae->_buffer_size = 0;
ae->_frame_rate = 0;
+ ae->_jack = 0;
if (was_running) {
- ae->Halted(); /* EMIT SIGNAL */
+ ae->Halted(""); /* EMIT SIGNAL */
+ MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */
}
}
bool
AudioEngine::can_request_hardware_monitoring ()
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,false);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,false);
const char ** ports;
if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
uint32_t
AudioEngine::n_physical_outputs (DataType type) const
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,0);
const char ** ports;
- uint32_t i = 0;
+ uint32_t cnt = 0;
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
return 0;
}
- for (i = 0; ports[i]; ++i) {}
+ for (uint32_t i = 0; ports[i]; ++i) {
+ if (!strstr (ports[i], "Midi-Through")) {
+ cnt++;
+ }
+ }
+
free (ports);
- return i;
+ return cnt;
}
uint32_t
AudioEngine::n_physical_inputs (DataType type) const
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,0);
const char ** ports;
- uint32_t i = 0;
-
+ uint32_t cnt = 0;
+
if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
return 0;
}
- for (i = 0; ports[i]; ++i) {}
+ for (uint32_t i = 0; ports[i]; ++i) {
+ if (!strstr (ports[i], "Midi-Through")) {
+ cnt++;
+ }
+ }
+
free (ports);
- return i;
+ return cnt;
}
void
AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
{
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
const char ** ports;
- uint32_t i = 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);
void
AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
{
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
const char ** ports;
uint32_t i = 0;
}
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,"");
+ GET_PRIVATE_JACK_POINTER_RET (_jack,"");
const char ** ports;
uint32_t i;
+ uint32_t idx;
string ret;
assert(type != DataType::NIL);
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;
}
void
AudioEngine::transport_stop ()
{
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
jack_transport_stop (_priv_jack);
}
void
AudioEngine::transport_start ()
{
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
jack_transport_start (_priv_jack);
}
void
AudioEngine::transport_locate (nframes_t where)
{
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
// cerr << "tell JACK to locate to " << where << endl;
jack_transport_locate (_priv_jack, where);
}
AudioEngine::TransportState
AudioEngine::transport_state ()
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, ((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 ()
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
- if (session) {
- if (session->config.get_jack_time_master()) {
+ 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);
int
AudioEngine::freewheel (bool onoff)
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (onoff != _freewheeling) {
-
- if (onoff) {
- _freewheel_thread_registered = false;
- }
-
- return jack_set_freewheel (_priv_jack, onoff);
-
+ return jack_set_freewheel (_priv_jack, onoff);
+
} else {
- /* already doing what has been asked for */
- return 0;
+ /* already doing what has been asked for */
+ return 0;
}
}
}
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 */
- _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
+#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);
if (_jack == NULL) {
// error message is not useful here
return -1;
}
- GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (status & JackNameNotUnique) {
jack_client_name = jack_get_client_name (_priv_jack);
int
AudioEngine::disconnect_from_jack ()
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
if (_running) {
stop_metering_thread ();
if (_running) {
_running = false;
Stopped(); /* EMIT SIGNAL */
+ MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */
}
return 0;
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;
}
return -1;
}
- GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
- if (session) {
- 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 (_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;
+ 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 (_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_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()) {
+ if (_session && _session->config.get_jack_time_master()) {
jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
}
int
AudioEngine::request_buffer_size (nframes_t nframes)
{
- GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+ GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
if (nframes == jack_get_buffer_size (_priv_jack)) {
return 0;
AudioEngine::update_total_latencies ()
{
#ifdef HAVE_JACK_RECOMPUTE_LATENCIES
- GET_PRIVATE_JACK_POINTER (_jack);
+ GET_PRIVATE_JACK_POINTER (_jack);
jack_recompute_total_latencies (_priv_jack);
#endif
}
bool
AudioEngine::is_realtime () const
{
- GET_PRIVATE_JACK_POINTER_RET (_jack,false);
+ GET_PRIVATE_JACK_POINTER_RET (_jack,false);
return jack_is_realtime (_priv_jack);
}
+
+pthread_t
+AudioEngine::create_process_thread (boost::function<void()> 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<ThreadData*> (arg);
+ boost::function<void()> f = td->f;
+ delete td;
+
+ f ();
+
+ return 0;
+}
projects / ardour.git / blobdiff