#include <vector>
#include <exception>
#include <stdexcept>
+#include <sstream>
#include <glibmm/timer.h>
#include <pbd/pthread_utils.h>
#include <pbd/stacktrace.h>
#include <pbd/unknown_type.h>
+#include <midi++/jack.h>
+
#include <ardour/audioengine.h>
#include <ardour/buffer.h>
#include <ardour/port.h>
+#include <ardour/jack_audio_port.h>
+#include <ardour/jack_midi_port.h>
#include <ardour/audio_port.h>
-#include <ardour/midi_port.h>
#include <ardour/session.h>
#include <ardour/cycle_timer.h>
#include <ardour/utils.h>
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);
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 ()
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)
{
knows about it.
*/
- PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096);
+ PBD::notify_gui_about_thread_creation (pthread_self(), X_("Audioengine"), 4096);
+ MIDI::JACK_MidiPort::set_process_thread (pthread_self());
}
int
AudioEngine::start ()
{
+ if (!_jack) {
+ error << _("AudioEngine::start() called while disconnected from JACK") << endmsg;
+ return -1;
+ }
+
if (!_running) {
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));
_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;
int
AudioEngine::stop (bool forever)
{
- if (_running) {
- _running = false;
+ if (_jack) {
if (forever) {
- jack_client_t* foo = _jack;
- _jack = 0;
- jack_client_close (foo);
- stop_metering_thread ();
+ disconnect_from_jack ();
} else {
jack_deactivate (_jack);
+ Stopped(); /* EMIT SIGNAL */
}
- Stopped(); /* EMIT SIGNAL */
}
return _running ? -1 : 0;
jack_position_t pos;
- (void) jack_transport_query (_jack, &pos);
-
- if (pos.valid & JackVideoFrameOffset) {
- offset = pos.video_offset;
- return true;
+ if (_jack) {
+ (void) jack_transport_query (_jack, &pos);
+
+ if (pos.valid & JackVideoFrameOffset) {
+ offset = pos.video_offset;
+ return true;
+ }
}
#endif
AudioEngine::_xrun_callback (void *arg)
{
AudioEngine* ae = static_cast<AudioEngine*> (arg);
- if (ae->jack()) {
+ if (ae->connected()) {
ae->Xrun (); /* EMIT SIGNAL */
}
return 0;
AudioEngine::_graph_order_callback (void *arg)
{
AudioEngine* ae = static_cast<AudioEngine*> (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)
{
static_cast<AudioEngine*>(arg)->_freewheeling = onoff;
}
+/** 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)
{
// 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 */
} else {
next_processed_frames = _processed_frames + nframes;
}
-
+
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_remove_pending = false;
session_removed.signal();
return 0;
}
+ boost::shared_ptr<Ports> p = ports.reader();
+
+ for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+
+ /* Only run cycle_start() on output ports, because
+ inputs must be done in the correct processing order,
+ which requires interleaving with route processing.
+ */
+
+ (*i)->cycle_start (nframes, 0);
+ }
+
if (_freewheeling) {
+ /* emit the Freewheel signal and stop freewheeling in the event of trouble */
if (Freewheel (nframes)) {
- cerr << "Freewheeling returned non-zero!\n";
- _freewheeling = false;
jack_set_freewheel (_jack, false);
}
+
+ } else {
+ if (session) {
+ session->process (nframes);
+ }
+ }
+
+ if (_freewheeling) {
return 0;
}
- if (run_process_cycle (session, nframes)) {
- /* we were zombified, maybe because a ladspa plugin took
- too long, or jackd exited, or something like that.
- */
+ if (!_running) {
_processed_frames = next_processed_frames;
return 0;
}
last_monitor_check = next_processed_frames;
}
- _processed_frames = next_processed_frames;
- return 0;
-}
-
-int
-AudioEngine::run_process_cycle (Session* s, jack_nframes_t nframes)
-{
- boost::shared_ptr<Ports> p = ports.reader();
+ if (session->silent()) {
- // Prepare ports (ie read data if necessary)
- for (Ports::iterator i = p->begin(); i != p->end(); ++i)
- (*i)->cycle_start (nframes);
-
- s->process (nframes);
+ boost::shared_ptr<Ports> p = ports.reader();
- if (!_running) {
- return -1;
+ for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+
+ Port *port = (*i);
+
+ if (port->sends_output()) {
+ port->get_buffer(nframes, 0 ).silence(nframes);
+ }
+ }
}
-
+
// Finalize ports (ie write data if necessary)
- for (Ports::iterator i = p->begin(); i != p->end(); ++i)
- (*i)->cycle_end ();
+ for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+
+ (*i)->cycle_end (nframes, 0);
+ }
+
+ _processed_frames = next_processed_frames;
return 0;
}
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);
}
}
can before we really start running.
*/
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
- run_process_cycle (session, blocksize);
+ boost::shared_ptr<Ports> p = ports.reader();
+
+ for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+ (*i)->cycle_start (blocksize, 0);
+ }
+
+ 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 (blocksize, 0);
+ }
}
}
session = 0;
}
- remove_all_ports ();
+ //FIXME: Preliminary bugfix for http://tracker.ardour.org/view.php?id=1985
+ //remove_all_ports ();
}
+void
+AudioEngine::port_registration_failure (const std::string& portname)
+{
+ string full_portname = jack_client_name;
+ full_portname += ':';
+ full_portname += portname;
+
+
+ jack_port_t* p = jack_port_by_name (_jack, full_portname.c_str());
+ string reason;
+
+ if (p) {
+ reason = _("a port with this name already exists: check for duplicated track/bus names");
+ } else {
+ reason = _("unknown error");
+ }
+
+ throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
+}
+
Port *
-AudioEngine::register_input_port (DataType type, const string& portname)
+AudioEngine::register_port (DataType dtype, const string& portname, bool input, bool publish)
{
- if (!_running) {
- if (!_has_run) {
- fatal << _("register input port called before engine was started") << endmsg;
- /*NOTREACHED*/
+ Port* newport = 0;
+
+ /*cerr << "trying to register port with name " << portname << endl;*/
+ try {
+ if (dtype == DataType::AUDIO) {
+ newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
+ } else if (dtype == DataType::MIDI) {
+ newport = new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
} else {
- return 0;
+ throw unknown_type();
}
- }
-
- jack_port_t *p = jack_port_register (_jack, portname.c_str(), type.to_jack_type(), JackPortIsInput, 0);
- if (p) {
+ /*cerr << "successfully got port " << portname << " with address " << newport << endl;*/
- Port* newport = 0;
-
- if (type == DataType::AUDIO)
- newport = new AudioPort (p);
- else if (type == DataType::MIDI)
- newport = new MidiPort (p);
- else
- throw unknown_type();
+ RCUWriter<Ports> writer (ports);
+ boost::shared_ptr<Ports> ps = writer.get_copy ();
+ /*cerr << "Address of ports list: " << ps << endl
+ << "Ports set size before insert: " << ps->size() << endl;*/
+ ps->insert (ps->begin(), newport);
+ /*cerr << "Ports set size after insert: " << ps->size() << endl;*/
- if (newport != 0) {
- RCUWriter<Ports> writer (ports);
- boost::shared_ptr<Ports> ps = writer.get_copy ();
- ps->insert (ps->begin(), newport);
- /* writer goes out of scope, forces update */
- }
+ /* writer goes out of scope, forces update */
return newport;
-
- } else {
- throw PortRegistrationFailure();
}
- return 0;
+ catch (...) {
+ throw PortRegistrationFailure("unable to create port (unknown type?)");
+ }
}
-Port *
-AudioEngine::register_output_port (DataType type, const string& portname)
+Port*
+AudioEngine::get_port (const std::string& full_name)
{
- if (!_running) {
- if (!_has_run) {
- fatal << _("register output port called before engine was started") << endmsg;
- /*NOTREACHED*/
- } else {
- return 0;
- }
- }
-
- jack_port_t* p = 0;
+ boost::shared_ptr<Ports> p = ports.reader();
- 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<Ports> writer (ports);
- boost::shared_ptr<Ports> ps = writer.get_copy ();
- ps->insert (ps->begin(), newport);
- /* writer goes out of scope, forces update */
+ for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+ //cerr << "comparing port name '" << (*i)->name() << "' with '" << full_name << "'" << endl;
+ if ((*i)->name() == full_name) {
+ return *i;
}
-
- return newport;
-
- } else {
- throw PortRegistrationFailure ();
}
-
return 0;
}
-int
+Port *
+AudioEngine::register_input_port (DataType type, const string& portname, bool publish)
+{
+ return register_port (type, portname, true, publish);
+}
+
+Port *
+AudioEngine::register_output_port (DataType type, const string& portname, bool publish)
+{
+ return register_port (type, portname, false, publish);
+}
+
+int
AudioEngine::unregister_port (Port& port)
{
+ /* caller must hold process lock */
+
+ cerr << "about to unregister Port xx x" << &port << "\n";
+
if (!_running) {
/* probably happening when the engine has been halted by JACK,
in which case, there is nothing we can do here.
*/
+ cerr << "not running\n";
return 0;
}
- int ret = jack_port_unregister (_jack, port._port);
-
- if (ret == 0) {
-
- {
-
- RCUWriter<Ports> writer (ports);
- boost::shared_ptr<Ports> ps = writer.get_copy ();
-
- for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
- if ((*i) == &port) {
- ps->erase (i);
- break;
- }
+ {
+ cerr << "before getcopy\n";
+
+ RCUWriter<Ports> writer (ports);
+ boost::shared_ptr<Ports> ps = writer.get_copy ();
+
+ cerr << "Ports set size: " << ps.get()->size() << endl;
+
+ for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
+ cerr << "before delete" << endl;
+ if ((*i) == &port) {
+ cerr << "About to delete " << &port << endl;
+ delete *i;
+ ps->erase (i);
+ cerr << "After erasing ports size: " << ps->size();
+ break;
}
-
- /* writer goes out of scope, forces update */
}
-
- remove_connections_for (port);
+
+ /* writer goes out of scope, forces update */
}
+
+ cerr << "before remove_connections\n";
+ remove_connections_for (port);
- return ret;
+ return 0;
}
int
AudioEngine::connect (const string& source, const string& destination)
{
+ int ret;
+
if (!_running) {
if (!_has_run) {
fatal << _("connect called before engine was started") << endmsg;
return -1;
}
}
-
+
string s = make_port_name_non_relative (source);
string d = make_port_name_non_relative (destination);
+
+ //cerr << "Trying to connect source: " << s << " with destination " << d << endl;
+
+ Port* src = get_port (s);
+ Port* dst = get_port (d);
+
+ if (src && dst) {
+
+ /* both ports are known to us, so do the internal connect stuff */
+
+ if ((ret = src->connect (*dst)) == 0) {
+ ret = dst->connect (*src);
+ }
- int ret = jack_connect (_jack, s.c_str(), d.c_str());
+ } else if (src || dst) {
- if (ret == 0) {
- pair<string,string> c (s, d);
- port_connections.push_back (c);
- } else if (ret == EEXIST) {
+ /* one port is known to us, try to connect it to something external */
+
+ PortConnectableByName* pcn;
+ string other;
+
+ if (src) {
+ pcn = dynamic_cast<PortConnectableByName*>(src);
+ other = d;
+ } else {
+ pcn = dynamic_cast<PortConnectableByName*>(dst);
+ other = s;
+ }
+
+ if (pcn) {
+ ret = pcn->connect (other);
+ } else {
+ ret = -1;
+ }
+
+ } else {
+
+ /* neither port is known to us, and this API isn't intended for use as a general patch bay */
+
+ ret = -1;
+
+ }
+
+ if (ret > 0) {
error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"),
- source, s, destination, d)
+ source, s, destination, d)
<< endmsg;
- } else {
+ } else if (ret < 0) {
error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"),
- source, s, destination, d)
+ source, s, destination, d)
<< endmsg;
}
int
AudioEngine::disconnect (const string& source, const string& destination)
{
+ int ret;
+
if (!_running) {
if (!_has_run) {
fatal << _("disconnect called before engine was started") << endmsg;
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());
+ //cerr << "trying to disconnect port '" << s << "' from port '" << d << endl;
+
+ Port* src = get_port (s);
+ Port* dst = get_port (d);
+
+ if (src && dst) {
- if (ret == 0) {
- pair<string,string> c (s, d);
- PortConnections::iterator i;
+ /* both ports are known to us, so do the internal connect stuff */
- if ((i = find (port_connections.begin(), port_connections.end(), c)) != port_connections.end()) {
- port_connections.erase (i);
+ if ((ret = src->disconnect (*dst)) == 0) {
+ ret = dst->disconnect (*src);
+ }
+
+ } else if (src || dst) {
+
+ /* one port is known to us, try to connect it to something external */
+
+
+ PortConnectableByName* pcn;
+ string other;
+
+ if (src) {
+ pcn = dynamic_cast<PortConnectableByName*>(src);
+ other = d;
+ } else {
+ pcn = dynamic_cast<PortConnectableByName*>(dst);
+ other = s;
+ }
+
+ if (pcn) {
+ ret = pcn->disconnect (other);
+ } else {
+ ret = -1;
}
+
+ } 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 ret = jack_port_disconnect (_jack, port._port);
-
- if (ret == 0) {
- remove_connections_for (port);
- }
-
- return ret;
-
+ return port.disconnect_all ();
}
ARDOUR::nframes_t
AudioEngine::halted (void *arg)
{
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;
- ae->Halted(); /* EMIT SIGNAL */
+ if (was_running) {
+ ae->Halted(); /* EMIT SIGNAL */
+ }
}
+bool
+AudioEngine::can_request_hardware_monitoring ()
+{
+ const char ** ports;
+
+ if (!_jack) {
+ return 0;
+ }
+
+ if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
+ return false;
+ }
+
+ free (ports);
+
+ return true;
+}
+
+
uint32_t
-AudioEngine::n_physical_outputs () const
+AudioEngine::n_physical_outputs (DataType type) const
{
const char ** ports;
uint32_t i = 0;
return 0;
}
- if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) {
+ if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
return 0;
}
- if (ports) {
- for (i = 0; ports[i]; ++i);
- free (ports);
- }
+ for (i = 0; ports[i]; ++i);
+ free (ports);
+
return i;
}
uint32_t
-AudioEngine::n_physical_inputs () const
+AudioEngine::n_physical_inputs (DataType type) const
{
const char ** ports;
uint32_t i = 0;
return 0;
}
- if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) {
+ if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
return 0;
}
}
void
-AudioEngine::get_physical_inputs (vector<string>& ins)
+AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
{
const char ** ports;
uint32_t i = 0;
return;
}
- if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) {
+ if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
return;
}
}
void
-AudioEngine::get_physical_outputs (vector<string>& outs)
+AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
{
const char ** ports;
uint32_t i = 0;
return;
}
- if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) {
+ if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
return;
}
ARDOUR::nframes_t
AudioEngine::get_port_total_latency (const Port& port)
+{
+ return port.total_latency ();
+}
+
+void
+AudioEngine::update_total_latency (const Port& port)
{
if (!_jack) {
- fatal << _("get_port_total_latency() called with no JACK client connection") << endmsg;
+ fatal << _("update_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;
+ fatal << _("update_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);
}
void
AudioEngine::transport_start ()
{
- // cerr << "tell JACK to start\n";
if (_jack) {
jack_transport_start (_jack);
}
{
if (_jack) {
- if (onoff) {
- _freewheel_thread_registered = false;
- }
+ if (onoff != _freewheeling) {
+
+ if (onoff) {
+ _freewheel_thread_registered = false;
+ }
- return jack_set_freewheel (_jack, onoff);
+ return jack_set_freewheel (_jack, onoff);
+
+ } else {
+ /* already doing what has been asked for */
+ return 0;
+ }
} else {
return -1;
{
/* process lock MUST be held */
- if (_jack) {
- boost::shared_ptr<Ports> p = ports.reader();
-
- for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
- jack_port_unregister (_jack, (*i)->_port);
- }
- }
-
{
RCUWriter<Ports> writer (ports);
boost::shared_ptr<Ports> ps = writer.get_copy ();
ps->clear ();
}
-
- port_connections.clear ();
}
void
}
}
+
#ifdef HAVE_JACK_CLIENT_OPEN
int
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) {
+ // error message is not useful here
return -1;
}
- if (status & JackServerStarted) {
- info << _("JACK server started") << endmsg;
- }
-
if (status & JackNameNotUnique) {
jack_client_name = jack_get_client_name (_jack);
}
{
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;
}
int
AudioEngine::disconnect_from_jack ()
{
- if (_jack == 0) {
+ if (!_jack) {
return 0;
}
- jack_client_close (_jack);
+
+ if (_running) {
+ stop_metering_thread ();
+ }
+
+ {
+ Glib::Mutex::Lock lm (_process_lock);
+ jack_client_close (_jack);
+ _jack = 0;
+ }
_buffer_size = 0;
_frame_rate = 0;
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);
boost::shared_ptr<Ports> 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;
}
if (Config->get_jack_time_master()) {
jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
- }
+ }
if (jack_activate (_jack) == 0) {
_running = true;
/* 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;
}
AudioEngine::update_total_latencies ()
{
#ifdef HAVE_JACK_RECOMPUTE_LATENCIES
- jack_recompute_total_latencies (_jack);
+ if (_jack) {
+ jack_recompute_total_latencies (_jack);
+ }
#endif
}