coreaudio: per-port parser for incoming MIDI, copied from ALSA Raw MIDI support
[ardour.git] / libs / backends / coreaudio / coreaudio_backend.cc
index 80f532c313f7ab67afdf6c87052860c7e90c3a37..beeeb2e86752329178805315b667b95d9377a422 100644 (file)
@@ -38,8 +38,48 @@ using namespace ARDOUR;
 static std::string s_instance_name;
 size_t CoreAudioBackend::_max_buffer_size = 8192;
 std::vector<std::string> CoreAudioBackend::_midi_options;
-std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_audio_device_status;
-std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_midi_device_status;
+std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_duplex_audio_device_status;
+std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_input_audio_device_status;
+std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_output_audio_device_status;
+
+
+/* static class instance access */
+static void hw_changed_callback_ptr (void *arg)
+{
+       CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
+       d->hw_changed_callback();
+}
+
+static void error_callback_ptr (void *arg)
+{
+       CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
+       d->error_callback();
+}
+
+static void xrun_callback_ptr (void *arg)
+{
+       CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
+       d->xrun_callback();
+}
+
+static void buffer_size_callback_ptr (void *arg)
+{
+       CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
+       d->buffer_size_callback();
+}
+
+static void sample_rate_callback_ptr (void *arg)
+{
+       CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
+       d->sample_rate_callback();
+}
+
+static void midi_port_change (void *arg)
+{
+       CoreAudioBackend *d = static_cast<CoreAudioBackend *>(arg);
+       d->coremidi_rediscover ();
+}
+
 
 CoreAudioBackend::CoreAudioBackend (AudioEngine& e, AudioBackendInfo& info)
        : AudioBackend (e, info)
@@ -51,8 +91,10 @@ CoreAudioBackend::CoreAudioBackend (AudioEngine& e, AudioBackendInfo& info)
        , _freewheel_ack (false)
        , _reinit_thread_callback (false)
        , _measure_latency (false)
-       , _audio_device("")
-       , _midi_driver_option(_("None"))
+       , _last_process_start (0)
+       , _input_audio_device("")
+       , _output_audio_device("")
+       , _midi_driver_option(get_standard_device_name(DeviceNone))
        , _samplerate (48000)
        , _samples_per_period (1024)
        , _n_inputs (0)
@@ -66,12 +108,14 @@ CoreAudioBackend::CoreAudioBackend (AudioEngine& e, AudioBackendInfo& info)
        _instance_name = s_instance_name;
        pthread_mutex_init (&_port_callback_mutex, 0);
        pthread_mutex_init (&_process_callback_mutex, 0);
+       pthread_mutex_init (&_freewheel_mutex, 0);
+       pthread_cond_init  (&_freewheel_signal, 0);
 
        _pcmio = new CoreAudioPCM ();
        _midiio = new CoreMidiIo ();
 
+       _pcmio->set_hw_changed_callback (hw_changed_callback_ptr, this);
        _pcmio->discover();
-       _midiio->discover();
 }
 
 CoreAudioBackend::~CoreAudioBackend ()
@@ -80,6 +124,8 @@ CoreAudioBackend::~CoreAudioBackend ()
        delete _midiio; _midiio = 0;
        pthread_mutex_destroy (&_port_callback_mutex);
        pthread_mutex_destroy (&_process_callback_mutex);
+       pthread_mutex_destroy (&_freewheel_mutex);
+       pthread_cond_destroy  (&_freewheel_signal);
 }
 
 /* AUDIOBACKEND API */
@@ -87,8 +133,7 @@ CoreAudioBackend::~CoreAudioBackend ()
 std::string
 CoreAudioBackend::name () const
 {
-       // XXX avoid name -conflict w/waves
-       return X_("CoreAudio2");
+       return X_("CoreAudio");
 }
 
 bool
@@ -100,42 +145,116 @@ CoreAudioBackend::is_realtime () const
 std::vector<AudioBackend::DeviceStatus>
 CoreAudioBackend::enumerate_devices () const
 {
-       _audio_device_status.clear();
+       _duplex_audio_device_status.clear();
        std::map<size_t, std::string> devices;
-       _pcmio->device_list(devices);
+       _pcmio->duplex_device_list(devices);
 
        for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
-               if (_audio_device == "") _audio_device = i->second;
-               _audio_device_status.push_back (DeviceStatus (i->second, true));
+               if (_input_audio_device == "") _input_audio_device = i->second;
+               if (_output_audio_device == "") _output_audio_device = i->second;
+               _duplex_audio_device_status.push_back (DeviceStatus (i->second, true));
        }
-       return _audio_device_status;
+       return _duplex_audio_device_status;
+}
+
+std::vector<AudioBackend::DeviceStatus>
+CoreAudioBackend::enumerate_input_devices () const
+{
+       _input_audio_device_status.clear();
+       std::map<size_t, std::string> devices;
+       _pcmio->input_device_list(devices);
+
+       _input_audio_device_status.push_back (DeviceStatus (get_standard_device_name(DeviceNone), true));
+       for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
+               if (_input_audio_device == "") _input_audio_device = i->second;
+               _input_audio_device_status.push_back (DeviceStatus (i->second, true));
+       }
+       return _input_audio_device_status;
+}
+
+
+std::vector<AudioBackend::DeviceStatus>
+CoreAudioBackend::enumerate_output_devices () const
+{
+       _output_audio_device_status.clear();
+       std::map<size_t, std::string> devices;
+       _pcmio->output_device_list(devices);
+
+       _output_audio_device_status.push_back (DeviceStatus (get_standard_device_name(DeviceNone), true));
+       for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
+               if (_output_audio_device == "") _output_audio_device = i->second;
+               _output_audio_device_status.push_back (DeviceStatus (i->second, true));
+       }
+       return _output_audio_device_status;
 }
 
 std::vector<float>
-CoreAudioBackend::available_sample_rates (const std::string&) const
+CoreAudioBackend::available_sample_rates (const std::string& device) const
 {
-       // TODO ask _pcmio for available rates
        std::vector<float> sr;
-       sr.push_back (44100.0);
-       sr.push_back (48000.0);
+       _pcmio->available_sample_rates (name_to_id (device), sr);
        return sr;
 }
 
+std::vector<float>
+CoreAudioBackend::available_sample_rates2 (const std::string& input_device, const std::string& output_device) const
+{
+       std::vector<float> sr;
+       std::vector<float> sr_in;
+       std::vector<float> sr_out;
+
+       const uint32_t inp = name_to_id (input_device);
+       const uint32_t out = name_to_id (output_device);
+
+       if (inp == UINT32_MAX && out == UINT32_MAX) {
+               return sr;
+       } else if (inp == UINT32_MAX) {
+               _pcmio->available_sample_rates (out, sr_out);
+               return sr_out;
+       } else if (out == UINT32_MAX) {
+               _pcmio->available_sample_rates (inp, sr_in);
+               return sr_in;
+       } else {
+               _pcmio->available_sample_rates (inp, sr_in);
+               _pcmio->available_sample_rates (out, sr_out);
+               // TODO allow to use different SR per device, tweak aggregate
+               std::set_intersection (sr_in.begin(), sr_in.end(), sr_out.begin(), sr_out.end(), std::back_inserter(sr));
+               return sr;
+       }
+}
+
 std::vector<uint32_t>
-CoreAudioBackend::available_buffer_sizes (const std::string&) const
+CoreAudioBackend::available_buffer_sizes (const std::string& device) const
 {
-       // TODO ask _pcmio for available rates
        std::vector<uint32_t> bs;
-       bs.push_back (64);
-       bs.push_back (128);
-       bs.push_back (256);
-       bs.push_back (512);
-       bs.push_back (1024);
-       bs.push_back (2048);
-       bs.push_back (4096);
+       _pcmio->available_buffer_sizes (name_to_id (device), bs);
        return bs;
 }
 
+std::vector<uint32_t>
+CoreAudioBackend::available_buffer_sizes2 (const std::string& input_device, const std::string& output_device) const
+{
+       std::vector<uint32_t> bs;
+       std::vector<uint32_t> bs_in;
+       std::vector<uint32_t> bs_out;
+       const uint32_t inp = name_to_id (input_device);
+       const uint32_t out = name_to_id (output_device);
+       if (inp == UINT32_MAX && out == UINT32_MAX) {
+               return bs;
+       } else if (inp == UINT32_MAX) {
+               _pcmio->available_buffer_sizes (out, bs_out);
+               return bs_out;
+       } else if (out == UINT32_MAX) {
+               _pcmio->available_buffer_sizes (inp, bs_in);
+               return bs_in;
+       } else {
+               _pcmio->available_buffer_sizes (inp, bs_in);
+               _pcmio->available_buffer_sizes (out, bs_out);
+               std::set_intersection (bs_in.begin(), bs_in.end(), bs_out.begin(), bs_out.end(), std::back_inserter(bs));
+               return bs;
+       }
+}
+
 uint32_t
 CoreAudioBackend::available_input_channel_count (const std::string&) const
 {
@@ -157,20 +276,44 @@ CoreAudioBackend::can_change_sample_rate_when_running () const
 bool
 CoreAudioBackend::can_change_buffer_size_when_running () const
 {
-       return false;
+       return true;
 }
 
 int
 CoreAudioBackend::set_device_name (const std::string& d)
 {
-       _audio_device = d;
+       int rv = 0;
+       rv |= set_input_device_name (d);
+       rv |= set_output_device_name (d);
+       return rv;
+}
+
+int
+CoreAudioBackend::set_input_device_name (const std::string& d)
+{
+       _input_audio_device = d;
+       const float sr = _pcmio->current_sample_rate(name_to_id(_input_audio_device));
+       if (sr > 0) { set_sample_rate(sr); }
+       return 0;
+}
+
+int
+CoreAudioBackend::set_output_device_name (const std::string& d)
+{
+       _output_audio_device = d;
+       // TODO check SR.
+       const float sr = _pcmio->current_sample_rate(name_to_id(_output_audio_device));
+       if (sr > 0) { set_sample_rate(sr); }
        return 0;
 }
 
 int
 CoreAudioBackend::set_sample_rate (float sr)
 {
-       if (sr <= 0) { return -1; }
+       std::vector<float> srs = available_sample_rates2 (_input_audio_device, _output_audio_device);
+       if (std::find(srs.begin(), srs.end(), sr) == srs.end()) {
+               return -1;
+       }
        _samplerate = sr;
        engine.sample_rate_change (sr);
        return 0;
@@ -183,6 +326,7 @@ CoreAudioBackend::set_buffer_size (uint32_t bs)
                return -1;
        }
        _samples_per_period = bs;
+       _pcmio->set_samples_per_period(bs);
        engine.buffer_size_change (bs);
        return 0;
 }
@@ -222,29 +366,23 @@ CoreAudioBackend::set_systemic_output_latency (uint32_t sl)
        return 0;
 }
 
-int
-CoreAudioBackend::set_systemic_midi_input_latency (std::string const device, uint32_t sl)
+/* Retrieving parameters */
+std::string
+CoreAudioBackend::device_name () const
 {
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return -1;
-       nfo->systemic_input_latency = sl;
-       return 0;
+       return "";
 }
 
-int
-CoreAudioBackend::set_systemic_midi_output_latency (std::string const device, uint32_t sl)
+std::string
+CoreAudioBackend::input_device_name () const
 {
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return -1;
-       nfo->systemic_output_latency = sl;
-       return 0;
+       return _input_audio_device;
 }
 
-/* Retrieving parameters */
 std::string
-CoreAudioBackend::device_name () const
+CoreAudioBackend::output_device_name () const
 {
-       return _audio_device;
+       return _output_audio_device;
 }
 
 float
@@ -289,51 +427,22 @@ CoreAudioBackend::systemic_output_latency () const
        return _systemic_audio_output_latency;
 }
 
-uint32_t
-CoreAudioBackend::systemic_midi_input_latency (std::string const device) const
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return 0;
-       return nfo->systemic_input_latency;
-}
-
-uint32_t
-CoreAudioBackend::systemic_midi_output_latency (std::string const device) const
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return 0;
-       return nfo->systemic_output_latency;
-}
-
 /* MIDI */
-struct CoreAudioBackend::CoreMidiDeviceInfo *
-CoreAudioBackend::midi_device_info(std::string const name) const {
-       return 0;
-}
 
 std::vector<std::string>
 CoreAudioBackend::enumerate_midi_options () const
 {
        if (_midi_options.empty()) {
                _midi_options.push_back (_("CoreMidi"));
-               _midi_options.push_back (_("None"));
+               _midi_options.push_back (get_standard_device_name(DeviceNone));
        }
        return _midi_options;
 }
 
-std::vector<AudioBackend::DeviceStatus>
-CoreAudioBackend::enumerate_midi_devices () const
-{
-       _midi_device_status.clear();
-       std::map<std::string, std::string> devices;
-       //_midi_device_status.push_back (DeviceStatus (_("CoreMidi"), true));
-       return _midi_device_status;
-}
-
 int
 CoreAudioBackend::set_midi_option (const std::string& opt)
 {
-       if (opt != _("None") && opt != _("CoreMidi")) {
+       if (opt != get_standard_device_name(DeviceNone) && opt != _("CoreMidi")) {
                return -1;
        }
        _midi_driver_option = opt;
@@ -346,21 +455,15 @@ CoreAudioBackend::midi_option () const
        return _midi_driver_option;
 }
 
-int
-CoreAudioBackend::set_midi_device_enabled (std::string const device, bool enable)
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return -1;
-       nfo->enabled = enable;
-       return 0;
-}
-
-bool
-CoreAudioBackend::midi_device_enabled (std::string const device) const
+void
+CoreAudioBackend::launch_control_app ()
 {
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return false;
-       return nfo->enabled;
+       if (name_to_id (_input_audio_device) != UINT32_MAX) {
+               _pcmio->launch_control_app(name_to_id(_input_audio_device));
+       }
+       if (name_to_id (_output_audio_device) != UINT32_MAX) {
+               _pcmio->launch_control_app(name_to_id(_output_audio_device));
+       }
 }
 
 /* State Control */
@@ -373,28 +476,17 @@ static void * pthread_freewheel (void *arg)
        return 0;
 }
 
-static int process_callback_ptr (void *arg)
-{
-       CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
-       return d->process_callback();
-}
-
-static void error_callback_ptr (void *arg)
+static int process_callback_ptr (void *arg, const uint32_t n_samples, const uint64_t host_time)
 {
        CoreAudioBackend *d = static_cast<CoreAudioBackend*> (arg);
-       d->error_callback();
-}
-
-static void midi_port_change (void *arg)
-{
-       CoreAudioBackend *d = static_cast<CoreAudioBackend *>(arg);
-       d->coremidi_rediscover ();
+       return d->process_callback(n_samples, host_time);
 }
 
-
 int
 CoreAudioBackend::_start (bool for_latency_measurement)
 {
+       AudioBackend::ErrorCode error_code = NoError;
+
        if ((!_active_ca || !_active_fw)  && _run) {
                // recover from 'halted', reap threads
                stop();
@@ -402,7 +494,7 @@ CoreAudioBackend::_start (bool for_latency_measurement)
 
        if (_active_ca || _active_fw || _run) {
                PBD::error << _("CoreAudioBackend: already active.") << endmsg;
-               return -1;
+               return BackendReinitializationError;
        }
 
        if (_ports.size()) {
@@ -414,38 +506,82 @@ CoreAudioBackend::_start (bool for_latency_measurement)
                _ports.clear();
        }
 
-#if 0
-       assert(_rmidi_in.size() == 0);
-       assert(_rmidi_out.size() == 0);
-#endif
-
-       uint32_t device_id = UINT32_MAX;
-       std::map<size_t, std::string> devices;
-       _pcmio->device_list(devices);
-
-       for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
-               if (i->second == _audio_device) {
-                       device_id = i->first;
-                       break;
-               }
-       }
+       uint32_t device1 = name_to_id(_input_audio_device);
+       uint32_t device2 = name_to_id(_output_audio_device);
 
        assert(_active_ca == false);
        assert(_active_fw == false);
 
        _freewheel_ack = false;
        _reinit_thread_callback = true;
+       _last_process_start = 0;
 
        _pcmio->set_error_callback (error_callback_ptr, this);
-       _pcmio->pcm_start (device_id, device_id, _samplerate, _samples_per_period, process_callback_ptr, this);
+       _pcmio->set_buffer_size_callback (buffer_size_callback_ptr, this);
+       _pcmio->set_sample_rate_callback (sample_rate_callback_ptr, this);
 
+       _pcmio->pcm_start (device1, device2, _samplerate, _samples_per_period, process_callback_ptr, this);
+#ifndef NDEBUG
+       printf("STATE: %d\n", _pcmio->state ());
+#endif
        switch (_pcmio->state ()) {
-               case 0: /* OK */ break;
-               case -1: PBD::error << _("CoreAudioBackend: failed to open device.") << endmsg; break;
-               default: PBD::error << _("CoreAudioBackend: initialization failed.") << endmsg; break;
+               case 0: /* OK */
+                       break;
+               case -1:
+                       PBD::error << _("CoreAudioBackend: Invalid Device ID.") << endmsg;
+                       error_code = AudioDeviceInvalidError;
+                       break;
+               case -2:
+                       PBD::error << _("CoreAudioBackend: Failed to resolve Device-Component by ID.") << endmsg;
+                       error_code = AudioDeviceNotAvailableError;
+                       break;
+               case -3:
+                       PBD::error << _("CoreAudioBackend: failed to open device.") << endmsg;
+                       error_code = AudioDeviceOpenError;
+                       break;
+               case -4:
+                       PBD::error << _("CoreAudioBackend: cannot set requested sample rate.") << endmsg;
+                       error_code = SampleRateNotSupportedError;
+                       break;
+               case -5:
+                       PBD::error << _("CoreAudioBackend: cannot configure requested buffer size.") << endmsg;
+                       error_code = PeriodSizeNotSupportedError;
+                       break;
+               case -6:
+                       PBD::error << _("CoreAudioBackend: unsupported sample format.") << endmsg;
+                       error_code = SampleFormatNotSupportedError;
+                       break;
+               case -7:
+                       PBD::error << _("CoreAudioBackend: Failed to enable Device.") << endmsg;
+                       error_code = BackendInitializationError; // XXX
+                       break;
+               case -8:
+                       PBD::error << _("CoreAudioBackend: Cannot allocate buffers, out-of-memory.") << endmsg;
+                       error_code = OutOfMemoryError;
+                       break;
+               case -9:
+                       PBD::error << _("CoreAudioBackend: Failed to set device-property listeners.") << endmsg;
+                       error_code = BackendInitializationError; // XXX
+                       break;
+               case -10:
+                       PBD::error << _("CoreAudioBackend: Setting Process Callback failed.") << endmsg;
+                       error_code = AudioDeviceIOError;
+                       break;
+               case -11:
+                       PBD::error << _("CoreAudioBackend: cannot use requested period size.") << endmsg;
+                       error_code = PeriodSizeNotSupportedError;
+                       break;
+               case -12:
+                       PBD::error << _("CoreAudioBackend: cannot create aggregate device.") << endmsg;
+                       error_code = DeviceConfigurationNotSupportedError;
+                       break;
+               default:
+                       PBD::error << _("CoreAudioBackend: initialization failure.") << endmsg;
+                       error_code = BackendInitializationError;
+                       break;
        }
        if (_pcmio->state ()) {
-               return -1;
+               return error_code;
        }
 
        if (_n_outputs != _pcmio->n_playback_channels ()) {
@@ -454,7 +590,7 @@ CoreAudioBackend::_start (bool for_latency_measurement)
                } else {
                 _n_outputs = std::min (_n_outputs, _pcmio->n_playback_channels ());
                }
-               PBD::warning << _("CoreAudioBackend: adjusted output channel count to match device.") << endmsg;
+               PBD::info << _("CoreAudioBackend: adjusted output channel count to match device.") << endmsg;
        }
 
        if (_n_inputs != _pcmio->n_capture_channels ()) {
@@ -463,21 +599,19 @@ CoreAudioBackend::_start (bool for_latency_measurement)
                } else {
                 _n_inputs = std::min (_n_inputs, _pcmio->n_capture_channels ());
                }
-               PBD::warning << _("CoreAudioBackend: adjusted input channel count to match device.") << endmsg;
+               PBD::info << _("CoreAudioBackend: adjusted input channel count to match device.") << endmsg;
        }
 
-#if 0 // TODO
-       if (_pcmio->sample_per_period() != _samples_per_period) {
-               _samples_per_period = _pcmio->sample_per_period();
+       if (_pcmio->samples_per_period() != _samples_per_period) {
+               _samples_per_period = _pcmio->samples_per_period();
                PBD::warning << _("CoreAudioBackend: samples per period does not match.") << endmsg;
        }
 
-       if (_pcmio->samplerate() != _samplerate) {
-               _samplerate = _pcmio->samplerate();
+       if (_pcmio->sample_rate() != _samplerate) {
+               _samplerate = _pcmio->sample_rate();
                engine.sample_rate_change (_samplerate);
                PBD::warning << _("CoreAudioBackend: sample rate does not match.") << endmsg;
        }
-#endif
 
        _measure_latency = for_latency_measurement;
 
@@ -485,18 +619,16 @@ CoreAudioBackend::_start (bool for_latency_measurement)
        _run = true;
        _port_change_flag = false;
 
-       printf("MIDI: %s\n", _midi_driver_option.c_str());
-
        if (_midi_driver_option == _("CoreMidi")) {
-               //register_system_midi_ports();
-               _midiio->setPortChangedCallback(midi_port_change, this);
-               _midiio->discover();
+               _midiio->set_enabled(true);
+               _midiio->set_port_changed_callback(midi_port_change, this);
+               _midiio->start(); // triggers port discovery, callback coremidi_rediscover()
        }
 
        if (register_system_audio_ports()) {
                PBD::error << _("CoreAudioBackend: failed to register system ports.") << endmsg;
                _run = false;
-               return -1;
+               return PortRegistrationError;
        }
 
        engine.sample_rate_change (_samplerate);
@@ -505,49 +637,52 @@ CoreAudioBackend::_start (bool for_latency_measurement)
        if (engine.reestablish_ports ()) {
                PBD::error << _("CoreAudioBackend: Could not re-establish ports.") << endmsg;
                _run = false;
-               return -1;
+               return PortReconnectError;
        }
 
-       engine.reconnect_ports ();
-
-
        if (pthread_create (&_freeewheel_thread, NULL, pthread_freewheel, this))
        {
                PBD::error << _("CoreAudioBackend: failed to create process thread.") << endmsg;
                delete _pcmio; _pcmio = 0;
                _run = false;
-               return -1;
+               return ProcessThreadStartError;
        }
 
        int timeout = 5000;
        while ((!_active_ca || !_active_fw) && --timeout > 0) { Glib::usleep (1000); }
 
        if (timeout == 0) {
-               printf("CoreAudioBackend: failed to start.");
                PBD::error << _("CoreAudioBackend: failed to start.") << endmsg;
        }
 
        if (!_active_fw) {
                PBD::error << _("CoreAudioBackend: failed to start freewheeling thread.") << endmsg;
-               printf("CoreAudioBackend: fw .\n");
                _run = false;
                _pcmio->pcm_stop();
                unregister_ports();
                _active_ca = false;
                _active_fw = false;
-               return -1;
+               return FreewheelThreadStartError;
        }
 
        if (!_active_ca) {
-               printf("CoreAudioBackend: ca .\n");
                PBD::error << _("CoreAudioBackend: failed to start coreaudio.") << endmsg;
                stop();
                _run = false;
-               return -1;
+               return ProcessThreadStartError;
        }
+
+       engine.reconnect_ports ();
+
+       // force  an initial registration_callback() & latency re-compute
+       _port_change_flag = true;
+       pre_process ();
+
+       // all systems go.
+       _pcmio->set_xrun_callback (xrun_callback_ptr, this);
        _preinit = false;
 
-       return 0;
+       return NoError;
 }
 
 int
@@ -560,28 +695,18 @@ CoreAudioBackend::stop ()
 
        _run = false;
        _pcmio->pcm_stop();
-       _midiio->setPortChangedCallback(NULL, NULL);
+       _midiio->set_port_changed_callback(NULL, NULL);
+       _midiio->stop();
+
+       pthread_mutex_lock (&_freewheel_mutex);
+       pthread_cond_signal (&_freewheel_signal);
+       pthread_mutex_unlock (&_freewheel_mutex);
 
        if (pthread_join (_freeewheel_thread, &status)) {
                PBD::error << _("CoreAudioBackend: failed to terminate.") << endmsg;
                return -1;
        }
 
-#if 0
-       while (!_rmidi_out.empty ()) {
-               CoreMidiIO *m = _rmidi_out.back ();
-               m->stop();
-               _rmidi_out.pop_back ();
-               delete m;
-       }
-       while (!_rmidi_in.empty ()) {
-               CoreMidiIO *m = _rmidi_in.back ();
-               m->stop();
-               _rmidi_in.pop_back ();
-               delete m;
-       }
-#endif
-
        unregister_ports();
 
        _active_ca = false;
@@ -597,6 +722,11 @@ CoreAudioBackend::freewheel (bool onoff)
                return 0;
        }
        _freewheeling = onoff;
+       // wake up freewheeling thread
+       if (0 == pthread_mutex_trylock (&_freewheel_mutex)) {
+               pthread_cond_signal (&_freewheel_signal);
+               pthread_mutex_unlock (&_freewheel_mutex);
+       }
        return 0;
 }
 
@@ -634,9 +764,32 @@ CoreAudioBackend::sample_time_at_cycle_start ()
 pframes_t
 CoreAudioBackend::samples_since_cycle_start ()
 {
-       return 0;
+       if (!_active_ca || !_run || _freewheeling || _freewheel) {
+               return 0;
+       }
+       if (_last_process_start == 0) {
+               return 0;
+       }
+
+       const uint64_t now = AudioGetCurrentHostTime ();
+       const int64_t elapsed_time_ns = AudioConvertHostTimeToNanos(now - _last_process_start);
+       return std::max((pframes_t)0, (pframes_t)rint(1e-9 * elapsed_time_ns * _samplerate));
 }
 
+uint32_t
+CoreAudioBackend::name_to_id(std::string device_name) const {
+       uint32_t device_id = UINT32_MAX;
+       std::map<size_t, std::string> devices;
+       _pcmio->device_list(devices);
+
+       for (std::map<size_t, std::string>::const_iterator i = devices.begin (); i != devices.end(); ++i) {
+               if (i->second == device_name) {
+                       device_id = i->first;
+                       break;
+               }
+       }
+       return device_id;
+}
 
 void *
 CoreAudioBackend::coreaudio_process_thread (void *arg)
@@ -749,7 +902,7 @@ int
 CoreAudioBackend::set_port_name (PortEngine::PortHandle port, const std::string& name)
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreAudioBackend::set_port_name: Invalid Port(s)") << endmsg;
+               PBD::warning << _("CoreAudioBackend::set_port_name: Invalid Port(s)") << endmsg;
                return -1;
        }
        return static_cast<CoreBackendPort*>(port)->set_name (_instance_name + ":" + name);
@@ -759,12 +912,29 @@ std::string
 CoreAudioBackend::get_port_name (PortEngine::PortHandle port) const
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreAudioBackend::get_port_name: Invalid Port(s)") << endmsg;
+               PBD::warning << _("CoreAudioBackend::get_port_name: Invalid Port(s)") << endmsg;
                return std::string ();
        }
        return static_cast<CoreBackendPort*>(port)->name ();
 }
 
+int
+CoreAudioBackend::get_port_property (PortHandle port, const std::string& key, std::string& value, std::string& type) const
+{
+       if (!valid_port (port)) {
+               PBD::warning << _("CoreAudioBackend::get_port_name: Invalid Port(s)") << endmsg;
+               return -1;
+       }
+       if (key == "http://jackaudio.org/metadata/pretty-name") {
+               type = "";
+               value = static_cast<CoreBackendPort*>(port)->pretty_name ();
+               if (!value.empty()) {
+                       return 0;
+               }
+       }
+       return -1;
+}
+
 PortEngine::PortHandle
 CoreAudioBackend::get_port_by_name (const std::string& name) const
 {
@@ -788,7 +958,7 @@ CoreAudioBackend::get_ports (
        }
        for (size_t i = 0; i < _ports.size (); ++i) {
                CoreBackendPort* port = _ports[i];
-               if ((port->type () == type) && (port->flags () & flags)) {
+               if ((port->type () == type) && flags == (port->flags () & flags)) {
                        if (!use_regexp || !regexec (&port_regex, port->name ().c_str (), 0, NULL, 0)) {
                                port_names.push_back (port->name ());
                                ++rv;
@@ -829,7 +999,7 @@ CoreAudioBackend::add_port (
 {
        assert(name.size ());
        if (find_port (name)) {
-               PBD::error << _("CoreAudioBackend::register_port: Port already exists:")
+               PBD::warning << _("CoreAudioBackend::register_port: Port already exists:")
                                << " (" << name << ")" << endmsg;
                return 0;
        }
@@ -860,7 +1030,7 @@ CoreAudioBackend::unregister_port (PortEngine::PortHandle port_handle)
        CoreBackendPort* port = static_cast<CoreBackendPort*>(port_handle);
        std::vector<CoreBackendPort*>::iterator i = std::find (_ports.begin (), _ports.end (), static_cast<CoreBackendPort*>(port_handle));
        if (i == _ports.end ()) {
-               PBD::error << _("CoreAudioBackend::unregister_port: Failed to find port") << endmsg;
+               PBD::warning << _("CoreAudioBackend::unregister_port: Failed to find port") << endmsg;
                return;
        }
        disconnect_all(port_handle);
@@ -873,95 +1043,143 @@ CoreAudioBackend::register_system_audio_ports()
 {
        LatencyRange lr;
 
-       // TODO ask _pcmio for port latencies
+       const uint32_t a_ins = _n_inputs;
+       const uint32_t a_out = _n_outputs;
+
+       const uint32_t coreaudio_reported_input_latency = _pcmio->get_latency(name_to_id(_input_audio_device), true);
+       const uint32_t coreaudio_reported_output_latency = _pcmio->get_latency(name_to_id(_output_audio_device), false);
 
-       const int a_ins = _n_inputs > 0 ? _n_inputs : 2;
-       const int a_out = _n_outputs > 0 ? _n_outputs : 2;
+#ifndef NDEBUG
+       printf("COREAUDIO LATENCY: i:%d, o:%d\n",
+                       coreaudio_reported_input_latency,
+                       coreaudio_reported_output_latency);
+#endif
 
        /* audio ports */
-       lr.min = lr.max = _samples_per_period + (_measure_latency ? 0 : _systemic_audio_input_latency);
-       for (int i = 1; i <= a_ins; ++i) {
+       lr.min = lr.max = coreaudio_reported_input_latency + (_measure_latency ? 0 : _systemic_audio_input_latency);
+       for (uint32_t i = 0; i < a_ins; ++i) {
                char tmp[64];
-               snprintf(tmp, sizeof(tmp), "system:capture_%d", i);
+               snprintf(tmp, sizeof(tmp), "system:capture_%d", i+1);
                PortHandle p = add_port(std::string(tmp), DataType::AUDIO, static_cast<PortFlags>(IsOutput | IsPhysical | IsTerminal));
                if (!p) return -1;
                set_latency_range (p, false, lr);
-               _system_inputs.push_back(static_cast<CoreBackendPort*>(p));
+               CoreBackendPort *cp = static_cast<CoreBackendPort*>(p);
+               cp->set_pretty_name (_pcmio->cached_port_name(i, true));
+               _system_inputs.push_back(cp);
        }
 
-       lr.min = lr.max = _samples_per_period + (_measure_latency ? 0 : _systemic_audio_output_latency);
-       for (int i = 1; i <= a_out; ++i) {
+       lr.min = lr.max = coreaudio_reported_output_latency + (_measure_latency ? 0 : _systemic_audio_output_latency);
+       for (uint32_t i = 0; i < a_out; ++i) {
                char tmp[64];
-               snprintf(tmp, sizeof(tmp), "system:playback_%d", i);
+               snprintf(tmp, sizeof(tmp), "system:playback_%d", i+1);
                PortHandle p = add_port(std::string(tmp), DataType::AUDIO, static_cast<PortFlags>(IsInput | IsPhysical | IsTerminal));
                if (!p) return -1;
                set_latency_range (p, true, lr);
-               _system_outputs.push_back(static_cast<CoreBackendPort*>(p));
+               CoreBackendPort *cp = static_cast<CoreBackendPort*>(p);
+               cp->set_pretty_name (_pcmio->cached_port_name(i, false));
+               _system_outputs.push_back(cp);
        }
        return 0;
 }
 
-int
-CoreAudioBackend::register_system_midi_ports()
+void
+CoreAudioBackend::coremidi_rediscover()
 {
-       int midi_ins = _system_midi_out.size();
-       int midi_outs =  _system_midi_in.size();
+       if (!_run) { return; }
+       assert(_midi_driver_option == _("CoreMidi"));
 
-       for (uint32_t i = midi_ins; i < _midiio->n_midi_outputs(); ++i) {
-               char tmp[64];
-               snprintf(tmp, sizeof(tmp), "system:midi_playback_%d", ++midi_ins);
-               PortHandle p = add_port(std::string(tmp), DataType::MIDI, static_cast<PortFlags>(IsInput | IsPhysical | IsTerminal));
+       pthread_mutex_lock (&_process_callback_mutex);
+
+       for (std::vector<CoreBackendPort*>::iterator it = _system_midi_out.begin (); it != _system_midi_out.end ();) {
+               bool found = false;
+               for (size_t i = 0; i < _midiio->n_midi_outputs(); ++i) {
+                       if ((*it)->name() == _midiio->port_id(i, false)) {
+                               found = true;
+                               break;
+                       }
+               }
+               if (found) {
+                       ++it;
+               } else {
+#ifndef NDEBUG
+                       printf("unregister MIDI Output: %s\n", (*it)->name().c_str());
+#endif
+                       _port_change_flag = true;
+                       unregister_port((*it));
+                       it = _system_midi_out.erase(it);
+               }
+       }
+
+       for (std::vector<CoreBackendPort*>::iterator it = _system_midi_in.begin (); it != _system_midi_in.end ();) {
+               bool found = false;
+               for (size_t i = 0; i < _midiio->n_midi_inputs(); ++i) {
+                       if ((*it)->name() == _midiio->port_id(i, true)) {
+                               found = true;
+                               break;
+                       }
+               }
+               if (found) {
+                       ++it;
+               } else {
+#ifndef NDEBUG
+                       printf("unregister MIDI Input: %s\n", (*it)->name().c_str());
+#endif
+                       _port_change_flag = true;
+                       unregister_port((*it));
+                       it = _system_midi_in.erase(it);
+               }
+       }
+
+       for (size_t i = 0; i < _midiio->n_midi_inputs(); ++i) {
+               std::string name = _midiio->port_id(i, true);
+               if (find_port_in(_system_midi_in, name)) {
+                       continue;
+               }
+
+#ifndef NDEBUG
+               printf("register MIDI Input: %s\n", name.c_str());
+#endif
+               PortHandle p = add_port(name, DataType::MIDI, static_cast<PortFlags>(IsOutput | IsPhysical | IsTerminal));
                if (!p) {
+                       fprintf(stderr, "failed to register MIDI IN: %s\n", name.c_str());
                        continue;
                }
                LatencyRange lr;
                lr.min = lr.max = _samples_per_period; // TODO add per-port midi-systemic latency
                set_latency_range (p, false, lr);
-               //static_cast<CoreMidiPort*>(p)->set_n_periods(2);
-               _system_midi_out.push_back(static_cast<CoreBackendPort*>(p));
+               CoreBackendPort *pp = static_cast<CoreBackendPort*>(p);
+               pp->set_pretty_name(_midiio->port_name(i, true));
+               _system_midi_in.push_back(pp);
+               _port_change_flag = true;
        }
 
-       for (uint32_t i = midi_outs; i < _midiio->n_midi_inputs(); ++i) {
-               char tmp[64];
-               snprintf(tmp, sizeof(tmp), "system:midi_capture_%d", ++midi_outs);
-               PortHandle p = add_port(std::string(tmp), DataType::MIDI, static_cast<PortFlags>(IsOutput | IsPhysical | IsTerminal));
+       for (size_t i = 0; i < _midiio->n_midi_outputs(); ++i) {
+               std::string name = _midiio->port_id(i, false);
+               if (find_port_in(_system_midi_out, name)) {
+                       continue;
+               }
+
+#ifndef NDEBUG
+               printf("register MIDI OUT: %s\n", name.c_str());
+#endif
+               PortHandle p = add_port(name, DataType::MIDI, static_cast<PortFlags>(IsInput | IsPhysical | IsTerminal));
                if (!p) {
+                       fprintf(stderr, "failed to register MIDI OUT: %s\n", name.c_str());
                        continue;
                }
                LatencyRange lr;
                lr.min = lr.max = _samples_per_period; // TODO add per-port midi-systemic latency
                set_latency_range (p, false, lr);
-               //static_cast<CoreMidiPort*>(p)->set_n_periods(2);
-               _system_midi_in.push_back(static_cast<CoreBackendPort*>(p));
+               CoreBackendPort *pp = static_cast<CoreBackendPort*>(p);
+               pp->set_pretty_name(_midiio->port_name(i, false));
+               _system_midi_out.push_back(pp);
+               _port_change_flag = true;
        }
 
-       return 0;
-}
-
-void
-CoreAudioBackend::coremidi_rediscover()
-{
-       if (!_run) { return; }
-       assert(_midi_driver_option == _("CoreMidi"));
-
-       pthread_mutex_lock (&_process_callback_mutex);
-
-       while (_system_midi_out.size() > _midiio->n_midi_outputs()) {
-               CoreBackendPort* p = _system_midi_out.back();
-               _system_midi_out.pop_back();
-               unregister_port(p);
-       }
-
-       while (_system_midi_in.size() > _midiio->n_midi_inputs()) {
-               CoreBackendPort* p = _system_midi_in.back();
-               _system_midi_in.pop_back();
-               unregister_port(p);
-       }
 
-       register_system_midi_ports();
+       assert(_system_midi_out.size() == _midiio->n_midi_outputs());
+       assert(_system_midi_in.size() == _midiio->n_midi_inputs());
 
-       _port_change_flag = true;
-       _reinit_thread_callback = true; // XXX, rather hook into _pcmio's  hardwarePropertyChangeCallback
        pthread_mutex_unlock (&_process_callback_mutex);
 }
 
@@ -992,12 +1210,12 @@ CoreAudioBackend::connect (const std::string& src, const std::string& dst)
        CoreBackendPort* dst_port = find_port (dst);
 
        if (!src_port) {
-               PBD::error << _("CoreAudioBackend::connect: Invalid Source port:")
+               PBD::warning << _("CoreAudioBackend::connect: Invalid Source port:")
                                << " (" << src <<")" << endmsg;
                return -1;
        }
        if (!dst_port) {
-               PBD::error << _("CoreAudioBackend::connect: Invalid Destination port:")
+               PBD::warning << _("CoreAudioBackend::connect: Invalid Destination port:")
                        << " (" << dst <<")" << endmsg;
                return -1;
        }
@@ -1011,7 +1229,7 @@ CoreAudioBackend::disconnect (const std::string& src, const std::string& dst)
        CoreBackendPort* dst_port = find_port (dst);
 
        if (!src_port || !dst_port) {
-               PBD::error << _("CoreAudioBackend::disconnect: Invalid Port(s)") << endmsg;
+               PBD::warning << _("CoreAudioBackend::disconnect: Invalid Port(s)") << endmsg;
                return -1;
        }
        return src_port->disconnect (dst_port);
@@ -1022,11 +1240,11 @@ CoreAudioBackend::connect (PortEngine::PortHandle src, const std::string& dst)
 {
        CoreBackendPort* dst_port = find_port (dst);
        if (!valid_port (src)) {
-               PBD::error << _("CoreAudioBackend::connect: Invalid Source Port Handle") << endmsg;
+               PBD::warning << _("CoreAudioBackend::connect: Invalid Source Port Handle") << endmsg;
                return -1;
        }
        if (!dst_port) {
-               PBD::error << _("CoreAudioBackend::connect: Invalid Destination Port")
+               PBD::warning << _("CoreAudioBackend::connect: Invalid Destination Port")
                        << " (" << dst << ")" << endmsg;
                return -1;
        }
@@ -1038,7 +1256,7 @@ CoreAudioBackend::disconnect (PortEngine::PortHandle src, const std::string& dst
 {
        CoreBackendPort* dst_port = find_port (dst);
        if (!valid_port (src) || !dst_port) {
-               PBD::error << _("CoreAudioBackend::disconnect: Invalid Port(s)") << endmsg;
+               PBD::warning << _("CoreAudioBackend::disconnect: Invalid Port(s)") << endmsg;
                return -1;
        }
        return static_cast<CoreBackendPort*>(src)->disconnect (dst_port);
@@ -1048,7 +1266,7 @@ int
 CoreAudioBackend::disconnect_all (PortEngine::PortHandle port)
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreAudioBackend::disconnect_all: Invalid Port") << endmsg;
+               PBD::warning << _("CoreAudioBackend::disconnect_all: Invalid Port") << endmsg;
                return -1;
        }
        static_cast<CoreBackendPort*>(port)->disconnect_all ();
@@ -1059,7 +1277,7 @@ bool
 CoreAudioBackend::connected (PortEngine::PortHandle port, bool /* process_callback_safe*/)
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreAudioBackend::disconnect_all: Invalid Port") << endmsg;
+               PBD::warning << _("CoreAudioBackend::disconnect_all: Invalid Port") << endmsg;
                return false;
        }
        return static_cast<CoreBackendPort*>(port)->is_connected ();
@@ -1070,7 +1288,7 @@ CoreAudioBackend::connected_to (PortEngine::PortHandle src, const std::string& d
 {
        CoreBackendPort* dst_port = find_port (dst);
        if (!valid_port (src) || !dst_port) {
-               PBD::error << _("CoreAudioBackend::connected_to: Invalid Port") << endmsg;
+               PBD::warning << _("CoreAudioBackend::connected_to: Invalid Port") << endmsg;
                return false;
        }
        return static_cast<CoreBackendPort*>(src)->is_connected (dst_port);
@@ -1080,7 +1298,7 @@ bool
 CoreAudioBackend::physically_connected (PortEngine::PortHandle port, bool /*process_callback_safe*/)
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreAudioBackend::physically_connected: Invalid Port") << endmsg;
+               PBD::warning << _("CoreAudioBackend::physically_connected: Invalid Port") << endmsg;
                return false;
        }
        return static_cast<CoreBackendPort*>(port)->is_physically_connected ();
@@ -1090,7 +1308,7 @@ int
 CoreAudioBackend::get_connections (PortEngine::PortHandle port, std::vector<std::string>& names, bool /*process_callback_safe*/)
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreAudioBackend::get_connections: Invalid Port") << endmsg;
+               PBD::warning << _("CoreAudioBackend::get_connections: Invalid Port") << endmsg;
                return -1;
        }
 
@@ -1112,7 +1330,7 @@ CoreAudioBackend::midi_event_get (
                size_t& size, uint8_t** buf, void* port_buffer,
                uint32_t event_index)
 {
-       assert (buf && port_buffer);
+       if (!buf || !port_buffer) return -1;
        CoreMidiBuffer& source = * static_cast<CoreMidiBuffer*>(port_buffer);
        if (event_index >= source.size ()) {
                return -1;
@@ -1125,34 +1343,38 @@ CoreAudioBackend::midi_event_get (
        return 0;
 }
 
+
 int
 CoreAudioBackend::midi_event_put (
                void* port_buffer,
                pframes_t timestamp,
                const uint8_t* buffer, size_t size)
 {
-       assert (buffer && port_buffer);
+       if (!buffer || !port_buffer) return -1;
        CoreMidiBuffer& dst = * static_cast<CoreMidiBuffer*>(port_buffer);
        if (dst.size () && (pframes_t)dst.back ()->timestamp () > timestamp) {
-               fprintf (stderr, "CoreMidiBuffer: it's too late for this event. %d > %d\n",
+#ifndef NDEBUG
+               // nevermind, ::get_buffer() sorts events
+               fprintf (stderr, "CoreMidiBuffer: unordered event: %d > %d\n",
                                (pframes_t)dst.back ()->timestamp (), timestamp);
-               return -1;
+#endif
        }
        dst.push_back (boost::shared_ptr<CoreMidiEvent>(new CoreMidiEvent (timestamp, buffer, size)));
        return 0;
 }
 
+
 uint32_t
 CoreAudioBackend::get_midi_event_count (void* port_buffer)
 {
-       assert (port_buffer);
+       if (!port_buffer) return 0;
        return static_cast<CoreMidiBuffer*>(port_buffer)->size ();
 }
 
 void
 CoreAudioBackend::midi_clear (void* port_buffer)
 {
-       assert (port_buffer);
+       if (!port_buffer) return;
        CoreMidiBuffer * buf = static_cast<CoreMidiBuffer*>(port_buffer);
        assert (buf);
        buf->clear ();
@@ -1190,7 +1412,8 @@ void
 CoreAudioBackend::set_latency_range (PortEngine::PortHandle port, bool for_playback, LatencyRange latency_range)
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreBackendPort::set_latency_range (): invalid port.") << endmsg;
+               PBD::warning << _("CoreBackendPort::set_latency_range (): invalid port.") << endmsg;
+               return;
        }
        static_cast<CoreBackendPort*>(port)->set_latency_range (latency_range, for_playback);
 }
@@ -1198,14 +1421,28 @@ CoreAudioBackend::set_latency_range (PortEngine::PortHandle port, bool for_playb
 LatencyRange
 CoreAudioBackend::get_latency_range (PortEngine::PortHandle port, bool for_playback)
 {
+       LatencyRange r;
        if (!valid_port (port)) {
-               PBD::error << _("CoreBackendPort::get_latency_range (): invalid port.") << endmsg;
-               LatencyRange r;
+               PBD::warning << _("CoreBackendPort::get_latency_range (): invalid port.") << endmsg;
                r.min = 0;
                r.max = 0;
                return r;
        }
-       return static_cast<CoreBackendPort*>(port)->latency_range (for_playback);
+       CoreBackendPort* p = static_cast<CoreBackendPort*>(port);
+       assert(p);
+
+       r = p->latency_range (for_playback);
+       if (p->is_physical() && p->is_terminal() && p->type() == DataType::AUDIO) {
+               if (p->is_input() && for_playback) {
+                       r.min += _samples_per_period;
+                       r.max += _samples_per_period;
+               }
+               if (p->is_output() && !for_playback) {
+                       r.min += _samples_per_period;
+                       r.max += _samples_per_period;
+               }
+       }
+       return r;
 }
 
 /* Discovering physical ports */
@@ -1214,7 +1451,7 @@ bool
 CoreAudioBackend::port_is_physical (PortEngine::PortHandle port) const
 {
        if (!valid_port (port)) {
-               PBD::error << _("CoreBackendPort::port_is_physical (): invalid port.") << endmsg;
+               PBD::warning << _("CoreBackendPort::port_is_physical (): invalid port.") << endmsg;
                return false;
        }
        return static_cast<CoreBackendPort*>(port)->is_physical ();
@@ -1289,13 +1526,12 @@ CoreAudioBackend::n_physical_inputs () const
 void*
 CoreAudioBackend::get_buffer (PortEngine::PortHandle port, pframes_t nframes)
 {
-       assert (port);
-       assert (valid_port (port));
+       if (!port || !valid_port (port)) return NULL;
        return static_cast<CoreBackendPort*>(port)->get_buffer (nframes);
 }
 
 void
-CoreAudioBackend::post_process ()
+CoreAudioBackend::pre_process ()
 {
        bool connections_changed = false;
        bool ports_changed = false;
@@ -1332,33 +1568,64 @@ CoreAudioBackend::freewheel_thread ()
 {
        _active_fw = true;
        bool first_run = false;
+       /* Freewheeling - use for export.   The first call to
+        * engine.process_callback() after engine.freewheel_callback will
+        * if the first export cycle.
+        * For reliable precise export timing, the calls need to be in sync.
+        *
+        * Furthermore we need to make sure the registered process thread
+        * is correct.
+        *
+        * _freewheeling = GUI thread state as set by ::freewheel()
+        * _freewheel = in sync here (export thread)
+        */
+       pthread_mutex_lock (&_freewheel_mutex);
        while (_run) {
                // check if we should run,
                if (_freewheeling != _freewheel) {
                        if (!_freewheeling) {
-                               // handshake w/ coreaudio
-                               _reinit_thread_callback = true;
-                               _freewheel_ack = false;
+                               // prepare leaving freewheeling mode
+                               _freewheel = false; // first mark as disabled
+                               _reinit_thread_callback = true; // hand over _main_thread
+                               _freewheel_ack = false; // prepare next handshake
+                               _midiio->set_enabled(true);
+                               engine.freewheel_callback (_freewheeling);
+                       } else {
+                               first_run = true;
+                               _freewheel = true;
                        }
-
-                       engine.freewheel_callback (_freewheeling);
-                       first_run = true;
-                       _freewheel = _freewheeling;
                }
 
                if (!_freewheel || !_freewheel_ack) {
-                       // TODO use a pthread sync/sleep
-                       Glib::usleep(200000);
+                       // wait for a change, we use a timed wait to
+                       // terminate early in case some error sets _run = 0
+                       struct timeval tv;
+                       struct timespec ts;
+                       gettimeofday (&tv, NULL);
+                       ts.tv_sec = tv.tv_sec + 3;
+                       ts.tv_nsec = 0;
+                       pthread_cond_timedwait (&_freewheel_signal, &_freewheel_mutex, &ts);
                        continue;
                }
 
                if (first_run) {
+                       // tell the engine we're ready to GO.
+                       engine.freewheel_callback (_freewheeling);
                        first_run = false;
                        _main_thread = pthread_self();
                        AudioEngine::thread_init_callback (this);
+                       _midiio->set_enabled(false);
                }
 
-               // Freewheelin'
+               // process port updates first in every cycle.
+               pre_process();
+
+               // prevent coreaudio device changes
+               pthread_mutex_lock (&_process_callback_mutex);
+
+               /* Freewheelin' */
+
+               // clear input buffers
                for (std::vector<CoreBackendPort*>::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) {
                        memset ((*it)->get_buffer (_samples_per_period), 0, _samples_per_period * sizeof (Sample));
                }
@@ -1366,87 +1633,93 @@ CoreAudioBackend::freewheel_thread ()
                        static_cast<CoreMidiBuffer*>((*it)->get_buffer(0))->clear ();
                }
 
+               _last_process_start = 0;
                if (engine.process_callback (_samples_per_period)) {
+                       pthread_mutex_unlock (&_process_callback_mutex);
                        break;
                }
+
+               pthread_mutex_unlock (&_process_callback_mutex);
                _dsp_load = 1.0;
                Glib::usleep (100); // don't hog cpu
-
-               post_process();
        }
 
+       pthread_mutex_unlock (&_freewheel_mutex);
+
        _active_fw = false;
 
-       if (_run && _freewheel) {
+       if (_run) {
+               // engine.process_callback() returner error
                engine.halted_callback("CoreAudio Freehweeling aborted.");
        }
        return 0;
 }
-
 int
-CoreAudioBackend::process_callback ()
+CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t host_time)
 {
        uint32_t i = 0;
-       uint64_t clock1, clock2;
+       uint64_t clock1;
 
        _active_ca = true;
 
        if (_run && _freewheel && !_freewheel_ack) {
-               _freewheel_ack = true;
+               // acknowledge freewheeling; hand-over thread ID
+               pthread_mutex_lock (&_freewheel_mutex);
+               if (_freewheel) _freewheel_ack = true;
+               pthread_cond_signal (&_freewheel_signal);
+               pthread_mutex_unlock (&_freewheel_mutex);
        }
 
        if (!_run || _freewheel || _preinit) {
-               return 1;
-       }
-
-       if (pthread_mutex_trylock (&_process_callback_mutex)) {
+               // NB if we return 1, the output is
+               // zeroed by the coreaudio callback
                return 1;
        }
 
        if (_reinit_thread_callback || _main_thread != pthread_self()) {
-               printf("REINIT THREAD\n");
                _reinit_thread_callback = false;
                _main_thread = pthread_self();
                AudioEngine::thread_init_callback (this);
-
-               manager.registration_callback();
-               manager.graph_order_callback();
        }
 
-       const uint32_t n_samples = _pcmio->n_samples();
-
-#if 0 // here in RT callback ?? XXX
-       if (_samples_per_period != n_samples) {
-               _samples_per_period = n_samples;
-               engine.buffer_size_change (_samples_per_period);
-               // TODO update latencies
-       }
+       if (pthread_mutex_trylock (&_process_callback_mutex)) {
+               // block while devices are added/removed
+#ifndef NDEBUG
+               printf("Xrun due to device change\n");
 #endif
+               engine.Xrun();
+               return 1;
+       }
+       /* port-connection change */
+       pre_process();
 
        // cycle-length in usec
-       const int64_t nominal_time = 1e6 * n_samples / _samplerate;
+       const double nominal_time = 1e6 * n_samples / _samplerate;
 
        clock1 = g_get_monotonic_time();
 
-       // TODO get midi
+       /* get midi */
        i=0;
        for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it, ++i) {
-               CoreMidiBuffer* mbuf = static_cast<CoreMidiBuffer*>((*it)->get_buffer(0));
-               mbuf->clear();
-               uint64_t time_ns;
-               uint8_t data[64]; // match MaxAlsaEventSize in alsa_rawmidi.cc
-               size_t size = sizeof(data);
-               while (_midiio->recv_event (i, nominal_time, time_ns, data, size)) {
-                       pframes_t time = floor((float) time_ns * _samplerate * 1e-9);
-                       assert (time < n_samples);
-                       midi_event_put((void*)mbuf, time, data, size);
-                       size = sizeof(data);
-               }
+                CoreMidiPort* port = dynamic_cast<CoreMidiPort*> (*it);
+                if (!port) {
+                        continue;
+                }
+                uint64_t time_ns;
+                uint8_t data[128]; // matches CoreMidi's MIDIPacket
+                size_t size = sizeof(data);
+                
+                while (_midiio->recv_event (i, nominal_time, time_ns, data, size)) {
+                        pframes_t time = floor((float) time_ns * _samplerate * 1e-9);
+                        assert (time < n_samples);
+                        port->parse_events (time, data, size);
+                        size = sizeof(data); /* prepare for next call to recv_event */
+                }
        }
 
        /* get audio */
        i = 0;
-       for (std::vector<CoreBackendPort*>::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) {
+       for (std::vector<CoreBackendPort*>::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it, ++i) {
                _pcmio->get_capture_channel (i, (float*)((*it)->get_buffer(n_samples)), n_samples);
        }
 
@@ -1456,6 +1729,7 @@ CoreAudioBackend::process_callback ()
        }
 
        _midiio->start_cycle();
+       _last_process_start = host_time;
 
        if (engine.process_callback (n_samples)) {
                fprintf(stderr, "ENGINE PROCESS ERROR\n");
@@ -1465,18 +1739,23 @@ CoreAudioBackend::process_callback ()
                return -1;
        }
 
-       // mixdown midi
+       /* mixdown midi */
        for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it) {
-               //static_cast<CoreMidiPort*>(*it)->next_period();
                static_cast<CoreMidiPort*>(*it)->get_buffer(0);
        }
-       // queue outgoing midi
+
+       /* queue outgoing midi */
        i = 0;
        for (std::vector<CoreBackendPort*>::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) {
+#if 0 // something's still b0rked with CoreMidiIo::send_events()
+               const CoreMidiBuffer *src = static_cast<const CoreMidiPort*>(*it)->const_buffer();
+               _midiio->send_events (i, nominal_time, (void*)src);
+#else // works..
                const CoreMidiBuffer *src = static_cast<const CoreMidiPort*>(*it)->const_buffer();
                for (CoreMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) {
                        _midiio->send_event (i, (*mit)->timestamp() / nominal_time, (*mit)->data(), (*mit)->size());
                }
+#endif
        }
 
        /* write back audio */
@@ -1487,16 +1766,12 @@ CoreAudioBackend::process_callback ()
 
        _processed_samples += n_samples;
 
-       // calc DSP load.
+       /* calc DSP load. */
+       _dsp_load_calc.set_max_time (_samplerate, _samples_per_period);
+       _dsp_load_calc.set_start_timestamp_us (clock1);
+       _dsp_load_calc.set_stop_timestamp_us (g_get_monotonic_time());
+       _dsp_load = _dsp_load_calc.get_dsp_load ();
 
-       clock2 = g_get_monotonic_time();
-       const int64_t elapsed_time = clock2 - clock1;
-       _dsp_load = elapsed_time / (float) nominal_time;
-
-       //engine.Xrun (); // TODO, if any
-
-       // port-connection change
-       post_process();
        pthread_mutex_unlock (&_process_callback_mutex);
        return 0;
 }
@@ -1504,11 +1779,54 @@ CoreAudioBackend::process_callback ()
 void
 CoreAudioBackend::error_callback ()
 {
-       printf("ERROR CALLBACK\n");
        _pcmio->set_error_callback (NULL, NULL);
+       _pcmio->set_sample_rate_callback (NULL, NULL);
+       _pcmio->set_xrun_callback (NULL, NULL);
+       _midiio->set_port_changed_callback(NULL, NULL);
        engine.halted_callback("CoreAudio Process aborted.");
+       _active_ca = false;
 }
 
+void
+CoreAudioBackend::xrun_callback ()
+{
+       engine.Xrun ();
+}
+
+void
+CoreAudioBackend::buffer_size_callback ()
+{
+       uint32_t bs = _pcmio->samples_per_period();
+       if (bs == _samples_per_period) {
+               return;
+       }
+       _samples_per_period = bs;
+       engine.buffer_size_change (_samples_per_period);
+}
+
+void
+CoreAudioBackend::sample_rate_callback ()
+{
+       if (_preinit) {
+#ifndef NDEBUG
+               printf("Samplerate change during initialization.\n");
+#endif
+               return;
+       }
+       _pcmio->set_error_callback (NULL, NULL);
+       _pcmio->set_sample_rate_callback (NULL, NULL);
+       _pcmio->set_xrun_callback (NULL, NULL);
+       _midiio->set_port_changed_callback(NULL, NULL);
+       engine.halted_callback("Sample Rate Changed.");
+       stop();
+}
+
+void
+CoreAudioBackend::hw_changed_callback ()
+{
+       _reinit_thread_callback = true;
+       engine.request_device_list_update();
+}
 
 /******************************************************************************/
 
@@ -1521,7 +1839,7 @@ static bool already_configured ();
 static bool available ();
 
 static ARDOUR::AudioBackendInfo _descriptor = {
-       "CoreAudio2",
+       "CoreAudio",
        instantiate,
        deinstantiate,
        backend_factory,
@@ -1590,33 +1908,33 @@ CoreBackendPort::~CoreBackendPort () {
 int CoreBackendPort::connect (CoreBackendPort *port)
 {
        if (!port) {
-               PBD::error << _("CoreBackendPort::connect (): invalid (null) port") << endmsg;
+               PBD::warning << _("CoreBackendPort::connect (): invalid (null) port") << endmsg;
                return -1;
        }
 
        if (type () != port->type ()) {
-               PBD::error << _("CoreBackendPort::connect (): wrong port-type") << endmsg;
+               PBD::warning << _("CoreBackendPort::connect (): wrong port-type") << endmsg;
                return -1;
        }
 
        if (is_output () && port->is_output ()) {
-               PBD::error << _("CoreBackendPort::connect (): cannot inter-connect output ports.") << endmsg;
+               PBD::warning << _("CoreBackendPort::connect (): cannot inter-connect output ports.") << endmsg;
                return -1;
        }
 
        if (is_input () && port->is_input ()) {
-               PBD::error << _("CoreBackendPort::connect (): cannot inter-connect input ports.") << endmsg;
+               PBD::warning << _("CoreBackendPort::connect (): cannot inter-connect input ports.") << endmsg;
                return -1;
        }
 
        if (this == port) {
-               PBD::error << _("CoreBackendPort::connect (): cannot self-connect ports.") << endmsg;
+               PBD::warning << _("CoreBackendPort::connect (): cannot self-connect ports.") << endmsg;
                return -1;
        }
 
        if (is_connected (port)) {
 #if 0 // don't bother to warn about this for now. just ignore it
-               PBD::error << _("CoreBackendPort::connect (): ports are already connected:")
+               PBD::info << _("CoreBackendPort::connect (): ports are already connected:")
                        << " (" << name () << ") -> (" << port->name () << ")"
                        << endmsg;
 #endif
@@ -1640,12 +1958,12 @@ void CoreBackendPort::_connect (CoreBackendPort *port, bool callback)
 int CoreBackendPort::disconnect (CoreBackendPort *port)
 {
        if (!port) {
-               PBD::error << _("CoreBackendPort::disconnect (): invalid (null) port") << endmsg;
+               PBD::warning << _("CoreBackendPort::disconnect (): invalid (null) port") << endmsg;
                return -1;
        }
 
        if (!is_connected (port)) {
-               PBD::error << _("CoreBackendPort::disconnect (): ports are not connected:")
+               PBD::warning << _("CoreBackendPort::disconnect (): ports are not connected:")
                        << " (" << name () << ") -> (" << port->name () << ")"
                        << endmsg;
                return -1;
@@ -1734,6 +2052,13 @@ CoreMidiPort::CoreMidiPort (CoreAudioBackend &b, const std::string& name, PortFl
        : CoreBackendPort (b, name, flags)
        , _n_periods (1)
        , _bufperiod (0)
+        , _event (0, 0)
+        , _first_time(true)
+        , _unbuffered_bytes(0)
+        , _total_bytes(0)
+        , _expected_bytes(0)
+        , _status_byte(0)
+
 {
        _buffer[0].clear ();
        _buffer[1].clear ();
@@ -1761,9 +2086,161 @@ void* CoreMidiPort::get_buffer (pframes_t /* nframes */)
                }
                std::sort ((_buffer[_bufperiod]).begin (), (_buffer[_bufperiod]).end (), MidiEventSorter());
        }
+        if (!_buffer[_bufperiod].empty()) {
+                fprintf (stderr, "COREMIDI: %s have data in buffer (%d events)\n", name().c_str(), _buffer[_bufperiod].size());
+        }
        return &(_buffer[_bufperiod]);
 }
 
+int
+CoreMidiPort::queue_event (
+        void* port_buffer,
+        pframes_t timestamp,
+        const uint8_t* buffer, size_t size)
+{
+       if (!buffer || !port_buffer) return -1;
+        _event._pending = false;
+       CoreMidiBuffer& dst = * static_cast<CoreMidiBuffer*>(port_buffer);
+       if (dst.size () && (pframes_t)dst.back ()->timestamp () > timestamp) {
+#ifndef NDEBUG
+               // nevermind, ::get_buffer() sorts events
+               fprintf (stderr, "CoreMidiBuffer: unordered event: %d > %d\n",
+                               (pframes_t)dst.back ()->timestamp (), timestamp);
+#endif
+       }
+        fprintf (stderr, "coremidi: queue event/buffer size %d @ %d\n", size, timestamp);
+       dst.push_back (boost::shared_ptr<CoreMidiEvent>(new CoreMidiEvent (timestamp, buffer, size)));
+       return 0;
+}
+
+void
+CoreMidiPort::parse_events (const uint64_t time, const uint8_t *data, const size_t size) 
+{
+        CoreMidiBuffer* mbuf = static_cast<CoreMidiBuffer*>(get_buffer(0));
+
+        mbuf->clear();
+        
+       if (_event._pending) {
+               if (queue_event (mbuf, _event._time, _parser_buffer, _event._size)) {
+                       return;
+               }
+       }
+
+       for (size_t i = 0; i < size; ++i) {
+               if (_first_time && !(data[i] & 0x80)) {
+                       continue;
+               }
+
+               _first_time = false; 
+                
+               if (process_byte(time, data[i])) {
+                       if (queue_event (mbuf, _event._time, _parser_buffer, _event._size)) {
+                               return;
+                       }
+               }
+       }
+}
+
+// based on JackMidiRawInputWriteQueue by Devin Anderson //
+bool
+CoreMidiPort::process_byte(const uint64_t time, const uint8_t byte)
+{
+       if (byte >= 0xf8) {
+               // Realtime
+               if (byte == 0xfd) {
+                       return false;
+               }
+               _parser_buffer[0] = byte;
+               prepare_byte_event(time, byte);
+               return true;
+       }
+       if (byte == 0xf7) {
+               // Sysex end
+               if (_status_byte == 0xf0) {
+                       record_byte(byte);
+                       return prepare_buffered_event(time);
+               }
+    _total_bytes = 0;
+    _unbuffered_bytes = 0;
+               _expected_bytes = 0;
+               _status_byte = 0;
+               return false;
+       }
+       if (byte >= 0x80) {
+               // Non-realtime status byte
+               if (_total_bytes) {
+                       printf ("CoreMidiPort: discarded bogus midi message\n");
+#if 0
+                       for (size_t i=0; i < _total_bytes; ++i) {
+                               printf("%02x ", _parser_buffer[i]);
+                       }
+                       printf("\n");
+#endif
+                       _total_bytes = 0;
+                       _unbuffered_bytes = 0;
+               }
+               _status_byte = byte;
+               switch (byte & 0xf0) {
+                       case 0x80:
+                       case 0x90:
+                       case 0xa0:
+                       case 0xb0:
+                       case 0xe0:
+                               // Note On, Note Off, Aftertouch, Control Change, Pitch Wheel
+                               _expected_bytes = 3;
+                               break;
+                       case 0xc0:
+                       case 0xd0:
+                               // Program Change, Channel Pressure
+                               _expected_bytes = 2;
+                               break;
+                       case 0xf0:
+                               switch (byte) {
+                                       case 0xf0:
+                                               // Sysex
+                                               _expected_bytes = 0;
+                                               break;
+                                       case 0xf1:
+                                       case 0xf3:
+                                               // MTC Quarter Frame, Song Select
+                                               _expected_bytes = 2;
+                                               break;
+                                       case 0xf2:
+                                               // Song Position
+                                               _expected_bytes = 3;
+                                               break;
+                                       case 0xf4:
+                                       case 0xf5:
+                                               // Undefined
+                                               _expected_bytes = 0;
+                                               _status_byte = 0;
+                                               return false;
+                                       case 0xf6:
+                                               // Tune Request
+                                               prepare_byte_event(time, byte);
+                                               _expected_bytes = 0;
+                                               _status_byte = 0;
+                                               return true;
+                               }
+               }
+               record_byte(byte);
+               return false;
+       }
+       // Data byte
+       if (! _status_byte) {
+               // Data bytes without a status will be discarded.
+               _total_bytes++;
+               _unbuffered_bytes++;
+               return false;
+       }
+       if (! _total_bytes) {
+               record_byte(_status_byte);
+       }
+       record_byte(byte);
+       return (_total_bytes == _expected_bytes) ? prepare_buffered_event(time) : false;
+}
+
+
 CoreMidiEvent::CoreMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size)
        : _size (size)
        , _timestamp (timestamp)