X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fbackends%2Falsa%2Falsa_audiobackend.cc;h=5c267d6c7f320df44b9f8cc1237b0c487599a24a;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=99b80f17d511d4e1ad5a3c885ade61f585c086d1;hpb=1691e965a5d259616941c25e08f78019cbe46fa5;p=ardour.git diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 99b80f17d5..5c267d6c7f 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -32,7 +32,7 @@ #include "ardour/filesystem_paths.h" #include "ardour/port_manager.h" #include "ardouralsautil/devicelist.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; @@ -69,6 +69,8 @@ AlsaAudioBackend::AlsaAudioBackend (AudioEngine& e, AudioBackendInfo& info) , _systemic_audio_output_latency (0) , _dsp_load (0) , _processed_samples (0) + , _midi_ins (0) + , _midi_outs (0) , _port_change_flag (false) { _instance_name = s_instance_name; @@ -330,6 +332,15 @@ AlsaAudioBackend::available_output_channel_count (const std::string& device) con return 128; } +std::vector +AlsaAudioBackend::available_period_sizes (const std::string& driver) const +{ + std::vector ps; + ps.push_back (2); + ps.push_back (3); + return ps; +} + bool AlsaAudioBackend::can_change_sample_rate_when_running () const { @@ -422,6 +433,19 @@ AlsaAudioBackend::set_sample_rate (float sr) return 0; } +int +AlsaAudioBackend::set_peridod_size (uint32_t n) +{ + if (n == 0 || n > 3) { + return -1; + } + if (_run) { + return -1; + } + _periods_per_cycle = n; + return 0; +} + int AlsaAudioBackend::set_buffer_size (uint32_t bs) { @@ -461,6 +485,9 @@ int AlsaAudioBackend::set_systemic_input_latency (uint32_t sl) { _systemic_audio_input_latency = sl; + if (_run) { + update_systemic_audio_latencies(); + } return 0; } @@ -468,6 +495,9 @@ int AlsaAudioBackend::set_systemic_output_latency (uint32_t sl) { _systemic_audio_output_latency = sl; + if (_run) { + update_systemic_audio_latencies(); + } return 0; } @@ -477,6 +507,9 @@ AlsaAudioBackend::set_systemic_midi_input_latency (std::string const device, uin struct AlsaMidiDeviceInfo * nfo = midi_device_info(device); if (!nfo) return -1; nfo->systemic_input_latency = sl; + if (_run && nfo->enabled) { + update_systemic_midi_latencies (); + } return 0; } @@ -486,9 +519,57 @@ AlsaAudioBackend::set_systemic_midi_output_latency (std::string const device, ui struct AlsaMidiDeviceInfo * nfo = midi_device_info(device); if (!nfo) return -1; nfo->systemic_output_latency = sl; + if (_run && nfo->enabled) { + update_systemic_midi_latencies (); + } return 0; } +void +AlsaAudioBackend::update_systemic_audio_latencies () +{ + const uint32_t lcpp = (_periods_per_cycle - 2) * _samples_per_period; + LatencyRange lr; + + lr.min = lr.max = lcpp + (_measure_latency ? 0 : _systemic_audio_input_latency); + for (std::vector::const_iterator it = _system_outputs.begin (); it != _system_outputs.end (); ++it) { + set_latency_range (*it, true, lr); + } + + lr.min = lr.max = (_measure_latency ? 0 : _systemic_audio_output_latency); + for (std::vector::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) { + set_latency_range (*it, false, lr); + } + update_latencies (); +} + +void +AlsaAudioBackend::update_systemic_midi_latencies () +{ + uint32_t i = 0; + for (std::vector::iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) { + assert (_rmidi_out.size() > i); + AlsaMidiOut *rm = _rmidi_out.at(i); + struct AlsaMidiDeviceInfo * nfo = midi_device_info (rm->name()); + assert (nfo); + LatencyRange lr; + lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_output_latency); + set_latency_range (*it, false, lr); + } + + i = 0; + for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it, ++i) { + assert (_rmidi_in.size() > i); + AlsaMidiIO *rm = _rmidi_in.at(i); + struct AlsaMidiDeviceInfo * nfo = midi_device_info (rm->name()); + assert (nfo); + LatencyRange lr; + lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_input_latency); + set_latency_range (*it, true, lr); + } + update_latencies (); +} + /* Retrieving parameters */ std::string AlsaAudioBackend::device_name () const @@ -526,6 +607,12 @@ AlsaAudioBackend::buffer_size () const return _samples_per_period; } +uint32_t +AlsaAudioBackend::period_size () const +{ + return _periods_per_cycle; +} + bool AlsaAudioBackend::interleaved () const { @@ -635,6 +722,9 @@ AlsaAudioBackend::set_midi_option (const std::string& opt) if (opt != get_standard_device_name(DeviceNone) && opt != _("ALSA raw devices") && opt != _("ALSA sequencer")) { return -1; } + if (_run && _midi_driver_option != opt) { + return -1; + } _midi_driver_option = opt; return 0; } @@ -650,7 +740,41 @@ AlsaAudioBackend::set_midi_device_enabled (std::string const device, bool enable { struct AlsaMidiDeviceInfo * nfo = midi_device_info(device); if (!nfo) return -1; + const bool prev_enabled = nfo->enabled; nfo->enabled = enable; + + if (_run && prev_enabled != enable) { + if (enable) { + // add ports for the given device + register_system_midi_ports(device); + } else { + // remove all ports provided by the given device + uint32_t i = 0; + for (std::vector::iterator it = _system_midi_out.begin (); it != _system_midi_out.end ();) { + assert (_rmidi_out.size() > i); + AlsaMidiOut *rm = _rmidi_out.at(i); + if (rm->name () != device) { ++it; ++i; continue; } + it = _system_midi_out.erase (it); + unregister_port (*it); + rm->stop(); + _rmidi_out.erase (_rmidi_out.begin() + i); + delete rm; + } + + i = 0; + for (std::vector::iterator it = _system_midi_in.begin (); it != _system_midi_in.end ();) { + assert (_rmidi_in.size() > i); + AlsaMidiIn *rm = _rmidi_in.at(i); + if (rm->name () != device) { ++it; ++i; continue; } + it = _system_midi_in.erase (it); + unregister_port (*it); + rm->stop(); + _rmidi_in.erase (_rmidi_in.begin() + i); + delete rm; + } + } + update_systemic_midi_latencies (); + } return 0; } @@ -682,16 +806,17 @@ AlsaAudioBackend::_start (bool for_latency_measurement) if (_active || _run) { PBD::error << _("AlsaAudioBackend: already active.") << endmsg; - return -1; + return BackendReinitializationError; } - if (_ports.size()) { + if (_ports.size () || _portmap.size ()) { PBD::warning << _("AlsaAudioBackend: recovering from unclean shutdown, port registry is not empty.") << endmsg; _system_inputs.clear(); _system_outputs.clear(); _system_midi_in.clear(); _system_midi_out.clear(); _ports.clear(); + _portmap.clear(); } /* reset internal state */ @@ -713,13 +838,13 @@ AlsaAudioBackend::_start (bool for_latency_measurement) if (_input_audio_device == get_standard_device_name(DeviceNone) && _output_audio_device == get_standard_device_name(DeviceNone)) { PBD::error << _("AlsaAudioBackend: At least one of input or output device needs to be set."); - return -1; + return AudioDeviceInvalidError; } if (_input_audio_device != _output_audio_device) { if (_input_audio_device != get_standard_device_name(DeviceNone) && _output_audio_device != get_standard_device_name(DeviceNone)) { PBD::error << _("AlsaAudioBackend: Cannot use two different devices."); - return -1; + return AudioDeviceInvalidError; } if (_input_audio_device != get_standard_device_name(DeviceNone)) { get_alsa_audio_device_names(devices, HalfDuplexIn); @@ -744,28 +869,59 @@ AlsaAudioBackend::_start (bool for_latency_measurement) } if (alsa_device == "") { PBD::error << _("AlsaAudioBackend: Cannot find configured device. Is it still connected?"); - return -1; + return AudioDeviceNotAvailableError; } acquire_device(alsa_device.c_str()); _pcmi = new Alsa_pcmi ( (duplex & 2) ? alsa_device.c_str() : NULL, (duplex & 1) ? alsa_device.c_str() : NULL, - 0, _samplerate, _samples_per_period, _periods_per_cycle, 0); - switch (_pcmi->state ()) { - case 0: /* OK */ break; - case -1: PBD::error << _("AlsaAudioBackend: failed to open device.") << endmsg; break; - case -2: PBD::error << _("AlsaAudioBackend: failed to allocate parameters.") << endmsg; break; - case -3: PBD::error << _("AlsaAudioBackend: cannot set requested sample rate.") << endmsg; break; - case -4: PBD::error << _("AlsaAudioBackend: cannot set requested period size.") << endmsg; break; - case -5: PBD::error << _("AlsaAudioBackend: cannot set requested number of periods.") << endmsg; break; - case -6: PBD::error << _("AlsaAudioBackend: unsupported sample format.") << endmsg; break; - default: PBD::error << _("AlsaAudioBackend: initialization failed.") << endmsg; break; + /* ctrl name */ 0, + _samplerate, _samples_per_period, + _periods_per_cycle, /* _periods_per_cycle */ 2, + /* debug */ 0); + + AudioBackend::ErrorCode error_code = NoError; + switch (_pcmi->state()) { + case 0: /* OK */ + break; + case -1: + PBD::error << _("AlsaAudioBackend: failed to open device.") << endmsg; + error_code = AudioDeviceOpenError; + break; + case -2: + PBD::error << _("AlsaAudioBackend: failed to allocate parameters.") << endmsg; + error_code = AudioDeviceOpenError; + break; + case -3: + PBD::error << _("AlsaAudioBackend: cannot set requested sample rate.") + << endmsg; + error_code = SampleRateNotSupportedError; + break; + case -4: + PBD::error << _("AlsaAudioBackend: cannot set requested period size.") + << endmsg; + error_code = PeriodSizeNotSupportedError; + break; + case -5: + PBD::error << _("AlsaAudioBackend: cannot set requested number of periods.") + << endmsg; + error_code = PeriodCountNotSupportedError; + break; + case -6: + PBD::error << _("AlsaAudioBackend: unsupported sample format.") << endmsg; + error_code = SampleFormatNotSupportedError; + break; + default: + PBD::error << _("AlsaAudioBackend: initialization failed.") << endmsg; + error_code = AudioDeviceOpenError; + break; } + if (_pcmi->state ()) { delete _pcmi; _pcmi = 0; release_device(); - return -1; + return error_code; } #ifndef NDEBUG @@ -803,13 +959,14 @@ AlsaAudioBackend::_start (bool for_latency_measurement) _measure_latency = for_latency_measurement; + _midi_ins = _midi_outs = 0; register_system_midi_ports(); if (register_system_audio_ports()) { PBD::error << _("AlsaAudioBackend: failed to register system ports.") << endmsg; delete _pcmi; _pcmi = 0; release_device(); - return -1; + return PortRegistrationError; } engine.sample_rate_change (_samplerate); @@ -819,7 +976,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) PBD::error << _("AlsaAudioBackend: Could not re-establish ports.") << endmsg; delete _pcmi; _pcmi = 0; release_device(); - return -1; + return PortReconnectError; } engine.reconnect_ports (); @@ -835,7 +992,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) delete _pcmi; _pcmi = 0; release_device(); _run = false; - return -1; + return ProcessThreadStartError; } else { PBD::warning << _("AlsaAudioBackend: cannot acquire realtime permissions.") << endmsg; } @@ -849,10 +1006,10 @@ AlsaAudioBackend::_start (bool for_latency_measurement) delete _pcmi; _pcmi = 0; release_device(); _run = false; - return -1; + return ProcessThreadStartError; } - return 0; + return NoError; } int @@ -884,6 +1041,7 @@ AlsaAudioBackend::stop () unregister_ports(); delete _pcmi; _pcmi = 0; + _midi_ins = _midi_outs = 0; release_device(); return (_active == false) ? 0 : -1; @@ -1052,23 +1210,63 @@ AlsaAudioBackend::port_name_size () const int AlsaAudioBackend::set_port_name (PortEngine::PortHandle port, const std::string& name) { + std::string newname (_instance_name + ":" + name); if (!valid_port (port)) { - PBD::error << _("AlsaBackend::set_port_name: Invalid Port(s)") << endmsg; + PBD::error << _("AlsaBackend::set_port_name: Invalid Port") << endmsg; return -1; } - return static_cast(port)->set_name (_instance_name + ":" + name); + if (find_port (newname)) { + PBD::error << _("AlsaBackend::set_port_name: Port with given name already exists") << endmsg; + return -1; + } + + AlsaPort* p = static_cast(port); + _portmap.erase (p->name()); + _portmap.insert (make_pair (newname, p)); + return p->set_name (newname); } std::string AlsaAudioBackend::get_port_name (PortEngine::PortHandle port) const { if (!valid_port (port)) { - PBD::error << _("AlsaBackend::get_port_name: Invalid Port(s)") << endmsg; + PBD::warning << _("AlsaBackend::get_port_name: Invalid Port(s)") << endmsg; return std::string (); } return static_cast(port)->name (); } +int +AlsaAudioBackend::get_port_property (PortHandle port, const std::string& key, std::string& value, std::string& type) const +{ + if (!valid_port (port)) { + PBD::warning << _("AlsaBackend::get_port_property: Invalid Port(s)") << endmsg; + return -1; + } + if (key == "http://jackaudio.org/metadata/pretty-name") { + type = ""; + value = static_cast(port)->pretty_name (); + if (!value.empty()) { + return 0; + } + } + return -1; +} + +int +AlsaAudioBackend::set_port_property (PortHandle port, const std::string& key, const std::string& value, const std::string& type) +{ + if (!valid_port (port)) { + PBD::warning << _("AlsaBackend::set_port_property: Invalid Port(s)") << endmsg; + return -1; + } + if (key == "http://jackaudio.org/metadata/pretty-name" && type.empty ()) { + static_cast(port)->set_pretty_name (value); + return 0; + } + return -1; +} + PortEngine::PortHandle AlsaAudioBackend::get_port_by_name (const std::string& name) const { @@ -1090,8 +1288,9 @@ AlsaAudioBackend::get_ports ( use_regexp = true; } } - for (size_t i = 0; i < _ports.size (); ++i) { - AlsaPort* port = _ports[i]; + + for (PortIndex::const_iterator i = _ports.begin (); i != _ports.end (); ++i) { + AlsaPort* port = *i; 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 ()); @@ -1150,7 +1349,8 @@ AlsaAudioBackend::add_port ( return 0; } - _ports.push_back (port); + _ports.insert (port); + _portmap.insert (make_pair (name, port)); return port; } @@ -1162,12 +1362,13 @@ AlsaAudioBackend::unregister_port (PortEngine::PortHandle port_handle) return; } AlsaPort* port = static_cast(port_handle); - std::vector::iterator i = std::find (_ports.begin (), _ports.end (), static_cast(port_handle)); + PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast(port_handle)); if (i == _ports.end ()) { PBD::error << _("AlsaBackend::unregister_port: Failed to find port") << endmsg; return; } disconnect_all(port_handle); + _portmap.erase (port->name()); _ports.erase (i); delete port; } @@ -1180,6 +1381,8 @@ AlsaAudioBackend::register_system_audio_ports() const int a_ins = _n_inputs; const int a_out = _n_outputs; + const uint32_t lcpp = (_periods_per_cycle - 2) * _samples_per_period; + /* audio ports */ lr.min = lr.max = (_measure_latency ? 0 : _systemic_audio_input_latency); for (int i = 1; i <= a_ins; ++i) { @@ -1188,27 +1391,31 @@ AlsaAudioBackend::register_system_audio_ports() PortHandle p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsOutput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, false, lr); - _system_inputs.push_back(static_cast(p)); + AlsaPort *ap = static_cast(p); + //ap->set_pretty_name ("") + _system_inputs.push_back (ap); } - lr.min = lr.max = (_measure_latency ? 0 : _systemic_audio_output_latency); + lr.min = lr.max = lcpp + (_measure_latency ? 0 : _systemic_audio_output_latency); for (int i = 1; i <= a_out; ++i) { char tmp[64]; snprintf(tmp, sizeof(tmp), "system:playback_%d", i); PortHandle p = add_port(std::string(tmp), DataType::AUDIO, static_cast(IsInput | IsPhysical | IsTerminal)); if (!p) return -1; set_latency_range (p, true, lr); - _system_outputs.push_back(static_cast(p)); + AlsaPort *ap = static_cast(p); + //ap->set_pretty_name ("") + _system_outputs.push_back (ap); } return 0; } int -AlsaAudioBackend::register_system_midi_ports() +AlsaAudioBackend::register_system_midi_ports(const std::string device) { std::map devices; - int midi_ins = 0; - int midi_outs = 0; + + // TODO use consistent numbering when re-adding devices: _midi_ins, _midi_outs if (_midi_driver_option == get_standard_device_name(DeviceNone)) { return 0; @@ -1219,15 +1426,18 @@ AlsaAudioBackend::register_system_midi_ports() } for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + if (!device.empty() && device != i->first) { + continue; + } struct AlsaMidiDeviceInfo * nfo = midi_device_info(i->first); if (!nfo) continue; if (!nfo->enabled) continue; AlsaMidiOut *mout; if (_midi_driver_option == _("ALSA raw devices")) { - mout = new AlsaRawMidiOut (i->second.c_str()); + mout = new AlsaRawMidiOut (i->first, i->second.c_str()); } else { - mout = new AlsaSeqMidiOut (i->second.c_str()); + mout = new AlsaSeqMidiOut (i->first, i->second.c_str()); } if (mout->state ()) { @@ -1245,7 +1455,7 @@ AlsaAudioBackend::register_system_midi_ports() delete mout; } else { char tmp[64]; - snprintf(tmp, sizeof(tmp), "system:midi_playback_%d", ++midi_ins); + snprintf(tmp, sizeof(tmp), "system:midi_playback_%d", ++_midi_ins); PortHandle p = add_port(std::string(tmp), DataType::MIDI, static_cast(IsInput | IsPhysical | IsTerminal)); if (!p) { mout->stop(); @@ -1253,18 +1463,20 @@ AlsaAudioBackend::register_system_midi_ports() } LatencyRange lr; lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_output_latency); - set_latency_range (p, false, lr); - static_cast(p)->set_n_periods(2); - _system_midi_out.push_back(static_cast(p)); + set_latency_range (p, true, lr); + static_cast(p)->set_n_periods(_periods_per_cycle); // TODO check MIDI alignment + AlsaPort *ap = static_cast(p); + ap->set_pretty_name (i->first); + _system_midi_out.push_back (ap); _rmidi_out.push_back (mout); } } AlsaMidiIn *midin; if (_midi_driver_option == _("ALSA raw devices")) { - midin = new AlsaRawMidiIn (i->second.c_str()); + midin = new AlsaRawMidiIn (i->first, i->second.c_str()); } else { - midin = new AlsaSeqMidiIn (i->second.c_str()); + midin = new AlsaSeqMidiIn (i->first, i->second.c_str()); } if (midin->state ()) { @@ -1282,7 +1494,7 @@ AlsaAudioBackend::register_system_midi_ports() delete midin; } else { char tmp[64]; - snprintf(tmp, sizeof(tmp), "system:midi_capture_%d", ++midi_outs); + snprintf(tmp, sizeof(tmp), "system:midi_capture_%d", ++_midi_outs); PortHandle p = add_port(std::string(tmp), DataType::MIDI, static_cast(IsOutput | IsPhysical | IsTerminal)); if (!p) { midin->stop(); @@ -1292,7 +1504,9 @@ AlsaAudioBackend::register_system_midi_ports() LatencyRange lr; lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_input_latency); set_latency_range (p, false, lr); - _system_midi_in.push_back(static_cast(p)); + AlsaPort *ap = static_cast(p); + ap->set_pretty_name (i->first); + _system_midi_in.push_back (ap); _rmidi_in.push_back (midin); } } @@ -1303,19 +1517,19 @@ AlsaAudioBackend::register_system_midi_ports() void AlsaAudioBackend::unregister_ports (bool system_only) { - size_t i = 0; _system_inputs.clear(); _system_outputs.clear(); _system_midi_in.clear(); _system_midi_out.clear(); - while (i < _ports.size ()) { - AlsaPort* port = _ports[i]; + + for (PortIndex::iterator i = _ports.begin (); i != _ports.end ();) { + PortIndex::iterator cur = i++; + AlsaPort* port = *cur; if (! system_only || (port->is_physical () && port->is_terminal ())) { port->disconnect_all (); + _portmap.erase (port->name()); delete port; - _ports.erase (_ports.begin() + i); - } else { - ++i; + _ports.erase (cur); } } } @@ -1404,10 +1618,12 @@ bool AlsaAudioBackend::connected_to (PortEngine::PortHandle src, const std::string& dst, bool /*process_callback_safe*/) { AlsaPort* dst_port = find_port (dst); +#ifndef NDEBUG if (!valid_port (src) || !dst_port) { PBD::error << _("AlsaBackend::connected_to: Invalid Port") << endmsg; return false; } +#endif return static_cast(src)->is_connected (dst_port); } @@ -1431,9 +1647,9 @@ AlsaAudioBackend::get_connections (PortEngine::PortHandle port, std::vector& connected_ports = static_cast(port)->get_connections (); + const std::set& connected_ports = static_cast(port)->get_connections (); - for (std::vector::const_iterator i = connected_ports.begin (); i != connected_ports.end (); ++i) { + for (std::set::const_iterator i = connected_ports.begin (); i != connected_ports.end (); ++i) { names.push_back ((*i)->name ()); } @@ -1574,8 +1790,8 @@ AlsaAudioBackend::port_is_physical (PortEngine::PortHandle port) const void AlsaAudioBackend::get_physical_outputs (DataType type, std::vector& port_names) { - for (size_t i = 0; i < _ports.size (); ++i) { - AlsaPort* port = _ports[i]; + for (PortIndex::iterator i = _ports.begin (); i != _ports.end (); ++i) { + AlsaPort* port = *i; if ((port->type () == type) && port->is_input () && port->is_physical ()) { port_names.push_back (port->name ()); } @@ -1585,8 +1801,8 @@ AlsaAudioBackend::get_physical_outputs (DataType type, std::vector& void AlsaAudioBackend::get_physical_inputs (DataType type, std::vector& port_names) { - for (size_t i = 0; i < _ports.size (); ++i) { - AlsaPort* port = _ports[i]; + for (PortIndex::iterator i = _ports.begin (); i != _ports.end (); ++i) { + AlsaPort* port = *i; if ((port->type () == type) && port->is_output () && port->is_physical ()) { port_names.push_back (port->name ()); } @@ -1598,8 +1814,8 @@ AlsaAudioBackend::n_physical_outputs () const { int n_midi = 0; int n_audio = 0; - for (size_t i = 0; i < _ports.size (); ++i) { - AlsaPort* port = _ports[i]; + for (PortIndex::const_iterator i = _ports.begin (); i != _ports.end (); ++i) { + AlsaPort* port = *i; if (port->is_output () && port->is_physical ()) { switch (port->type ()) { case DataType::AUDIO: ++n_audio; break; @@ -1619,8 +1835,8 @@ AlsaAudioBackend::n_physical_inputs () const { int n_midi = 0; int n_audio = 0; - for (size_t i = 0; i < _ports.size (); ++i) { - AlsaPort* port = _ports[i]; + for (PortIndex::const_iterator i = _ports.begin (); i != _ports.end (); ++i) { + AlsaPort* port = *i; if (port->is_input () && port->is_physical ()) { switch (port->type ()) { case DataType::AUDIO: ++n_audio; break; @@ -1974,7 +2190,7 @@ int AlsaPort::connect (AlsaPort *port) void AlsaPort::_connect (AlsaPort *port, bool callback) { - _connections.push_back (port); + _connections.insert (port); if (callback) { port->_connect (this, false); _alsa_backend.port_connect_callback (name(), port->name(), true); @@ -2000,12 +2216,9 @@ int AlsaPort::disconnect (AlsaPort *port) void AlsaPort::_disconnect (AlsaPort *port, bool callback) { - std::vector::iterator it = std::find (_connections.begin (), _connections.end (), port); - + std::set::iterator it = _connections.find (port); assert (it != _connections.end ()); - _connections.erase (it); - if (callback) { port->_disconnect (this, false); _alsa_backend.port_connect_callback (name(), port->name(), false); @@ -2016,21 +2229,22 @@ void AlsaPort::_disconnect (AlsaPort *port, bool callback) void AlsaPort::disconnect_all () { while (!_connections.empty ()) { - _connections.back ()->_disconnect (this, false); - _alsa_backend.port_connect_callback (name(), _connections.back ()->name(), false); - _connections.pop_back (); + std::set::iterator it = _connections.begin (); + (*it)->_disconnect (this, false); + _alsa_backend.port_connect_callback (name(), (*it)->name(), false); + _connections.erase (it); } } bool AlsaPort::is_connected (const AlsaPort *port) const { - return std::find (_connections.begin (), _connections.end (), port) != _connections.end (); + return _connections.find (const_cast(port)) != _connections.end (); } bool AlsaPort::is_physically_connected () const { - for (std::vector::const_iterator it = _connections.begin (); it != _connections.end (); ++it) { + for (std::set::const_iterator it = _connections.begin (); it != _connections.end (); ++it) { if ((*it)->is_physical ()) { return true; } @@ -2052,14 +2266,15 @@ AlsaAudioPort::~AlsaAudioPort () { } void* AlsaAudioPort::get_buffer (pframes_t n_samples) { if (is_input ()) { - std::vector::const_iterator it = get_connections ().begin (); - if (it == get_connections ().end ()) { + const std::set& connections = get_connections (); + std::set::const_iterator it = connections.begin (); + if (it == connections.end ()) { memset (_buffer, 0, n_samples * sizeof (Sample)); } else { AlsaAudioPort const * source = static_cast(*it); assert (source && source->is_output ()); memcpy (_buffer, source->const_buffer (), n_samples * sizeof (Sample)); - while (++it != get_connections ().end ()) { + while (++it != connections.end ()) { source = static_cast(*it); assert (source && source->is_output ()); Sample* dst = buffer (); @@ -2095,8 +2310,9 @@ void* AlsaMidiPort::get_buffer (pframes_t /* nframes */) { if (is_input ()) { (_buffer[_bufperiod]).clear (); - for (std::vector::const_iterator i = get_connections ().begin (); - i != get_connections ().end (); + const std::set& connections = get_connections (); + for (std::set::const_iterator i = connections.begin (); + i != connections.end (); ++i) { const AlsaMidiBuffer * src = static_cast(*i)->const_buffer (); for (AlsaMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) {