X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fbackends%2Falsa%2Falsa_audiobackend.cc;h=725fc80b765c63b9f64340c2afaa3229ec07d72b;hb=dac57703ccd7205ac94c14b407b802a69f4187f1;hp=fcbf8871cceea391df77131f099ea58a21f1ad9d;hpb=d7fc573cb8c4292b6150a6f52e4a38df96a61e5f;p=ardour.git diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index fcbf8871cc..725fc80b76 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -38,28 +38,45 @@ using namespace ARDOUR; static std::string s_instance_name; size_t AlsaAudioBackend::_max_buffer_size = 8192; +std::vector AlsaAudioBackend::_midi_options; +std::vector AlsaAudioBackend::_input_audio_device_status; +std::vector AlsaAudioBackend::_output_audio_device_status; +std::vector AlsaAudioBackend::_duplex_audio_device_status; +std::vector AlsaAudioBackend::_midi_device_status; + +ALSADeviceInfo AlsaAudioBackend::_input_audio_device_info; +ALSADeviceInfo AlsaAudioBackend::_output_audio_device_info; AlsaAudioBackend::AlsaAudioBackend (AudioEngine& e, AudioBackendInfo& info) : AudioBackend (e, info) , _pcmi (0) , _run (false) , _active (false) + , _freewheel (false) , _freewheeling (false) - , _audio_device("") - , _midi_device("") + , _measure_latency (false) + , _last_process_start (0) + , _input_audio_device("") + , _output_audio_device("") + , _midi_driver_option(get_standard_device_name(DeviceNone)) , _device_reservation(0) , _samplerate (48000) , _samples_per_period (1024) , _periods_per_cycle (2) - , _dsp_load (0) , _n_inputs (0) , _n_outputs (0) - , _systemic_input_latency (0) - , _systemic_output_latency (0) + , _systemic_audio_input_latency (0) + , _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; pthread_mutex_init (&_port_callback_mutex, 0); + _input_audio_device_info.valid = false; + _output_audio_device_info.valid = false; } AlsaAudioBackend::~AlsaAudioBackend () @@ -84,13 +101,43 @@ AlsaAudioBackend::is_realtime () const std::vector AlsaAudioBackend::enumerate_devices () const { - std::vector s; + _duplex_audio_device_status.clear(); std::map devices; get_alsa_audio_device_names(devices); for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { - s.push_back (DeviceStatus (i->first, true)); + if (_input_audio_device == "") _input_audio_device = i->first; + if (_output_audio_device == "") _output_audio_device = i->first; + _duplex_audio_device_status.push_back (DeviceStatus (i->first, true)); + } + return _duplex_audio_device_status; +} + +std::vector +AlsaAudioBackend::enumerate_input_devices () const +{ + _input_audio_device_status.clear(); + std::map devices; + get_alsa_audio_device_names(devices, HalfDuplexIn); + _input_audio_device_status.push_back (DeviceStatus (get_standard_device_name(DeviceNone), true)); + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + if (_input_audio_device == "") _input_audio_device = i->first; + _input_audio_device_status.push_back (DeviceStatus (i->first, true)); } - return s; + return _input_audio_device_status; +} + +std::vector +AlsaAudioBackend::enumerate_output_devices () const +{ + _output_audio_device_status.clear(); + std::map devices; + get_alsa_audio_device_names(devices, HalfDuplexOut); + _output_audio_device_status.push_back (DeviceStatus (get_standard_device_name(DeviceNone), true)); + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + if (_output_audio_device == "") _output_audio_device = i->first; + _output_audio_device_status.push_back (DeviceStatus (i->first, true)); + } + return _output_audio_device_status; } void @@ -105,8 +152,9 @@ void AlsaAudioBackend::release_device() { _reservation_connection.drop_connections(); - delete _device_reservation; + ARDOUR::SystemExec * tmp = _device_reservation; _device_reservation = 0; + delete tmp; } bool @@ -126,7 +174,7 @@ AlsaAudioBackend::acquire_device(const char* device_name) _reservation_succeeded = false; std::string request_device_exe; - if (!PBD::find_file_in_search_path ( + if (!PBD::find_file ( PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "ardouralsautil") + G_SEARCHPATH_SEPARATOR_S + ARDOUR::ardour_dll_directory()), "ardour-request-device", request_device_exe)) @@ -170,47 +218,127 @@ AlsaAudioBackend::acquire_device(const char* device_name) } std::vector -AlsaAudioBackend::available_sample_rates (const std::string&) const +AlsaAudioBackend::available_sample_rates2 (const std::string& input_device, const std::string& output_device) const +{ + std::vector sr; + if (input_device == get_standard_device_name(DeviceNone) && output_device == get_standard_device_name(DeviceNone)) { + return sr; + } + else if (input_device == get_standard_device_name(DeviceNone)) { + sr = available_sample_rates (output_device); + } + else if (output_device == get_standard_device_name(DeviceNone)) { + sr = available_sample_rates (input_device); + } else { + std::vector sr_in = available_sample_rates (input_device); + std::vector sr_out = available_sample_rates (output_device); + std::set_intersection (sr_in.begin(), sr_in.end(), sr_out.begin(), sr_out.end(), std::back_inserter(sr)); + } + return sr; +} + +std::vector +AlsaAudioBackend::available_sample_rates (const std::string& device) const { + ALSADeviceInfo *nfo = NULL; std::vector sr; - sr.push_back (8000.0); - sr.push_back (22050.0); - sr.push_back (24000.0); - sr.push_back (44100.0); - sr.push_back (48000.0); - sr.push_back (88200.0); - sr.push_back (96000.0); - sr.push_back (176400.0); - sr.push_back (192000.0); + if (device == get_standard_device_name(DeviceNone)) { + return sr; + } + if (device == _input_audio_device && _input_audio_device_info.valid) { + nfo = &_input_audio_device_info; + } + else if (device == _output_audio_device && _output_audio_device_info.valid) { + nfo = &_output_audio_device_info; + } + + static const float avail_rates [] = { 8000, 22050.0, 24000.0, 44100.0, 48000.0, 88200.0, 96000.0, 176400.0, 192000.0 }; + + for (size_t i = 0 ; i < sizeof(avail_rates) / sizeof(float); ++i) { + if (!nfo || (avail_rates[i] >= nfo->min_rate && avail_rates[i] <= nfo->max_rate)) { + sr.push_back (avail_rates[i]); + } + } + return sr; } std::vector -AlsaAudioBackend::available_buffer_sizes (const std::string&) const +AlsaAudioBackend::available_buffer_sizes2 (const std::string& input_device, const std::string& output_device) const +{ + std::vector bs; + if (input_device == get_standard_device_name(DeviceNone) && output_device == get_standard_device_name(DeviceNone)) { + return bs; + } + else if (input_device == get_standard_device_name(DeviceNone)) { + bs = available_buffer_sizes (output_device); + } + else if (output_device == get_standard_device_name(DeviceNone)) { + bs = available_buffer_sizes (input_device); + } else { + std::vector bs_in = available_buffer_sizes (input_device); + std::vector bs_out = available_buffer_sizes (output_device); + std::set_intersection (bs_in.begin(), bs_in.end(), bs_out.begin(), bs_out.end(), std::back_inserter(bs)); + } + return bs; +} + +std::vector +AlsaAudioBackend::available_buffer_sizes (const std::string& device) const { + ALSADeviceInfo *nfo = NULL; std::vector bs; - bs.push_back (32); - 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); - bs.push_back (8192); + if (device == get_standard_device_name(DeviceNone)) { + return bs; + } + if (device == _input_audio_device && _input_audio_device_info.valid) { + nfo = &_input_audio_device_info; + } + else if (device == _output_audio_device && _output_audio_device_info.valid) { + nfo = &_output_audio_device_info; + } + + static const unsigned long avail_sizes [] = { 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192 }; + + for (size_t i = 0 ; i < sizeof(avail_sizes) / sizeof(unsigned long); ++i) { + if (!nfo || (avail_sizes[i] >= nfo->min_size && avail_sizes[i] <= nfo->max_size)) { + bs.push_back (avail_sizes[i]); + } + } return bs; } uint32_t -AlsaAudioBackend::available_input_channel_count (const std::string&) const +AlsaAudioBackend::available_input_channel_count (const std::string& device) const { - return 128; // TODO query current device + if (device == get_standard_device_name(DeviceNone)) { + return 0; + } + if (device == _input_audio_device && _input_audio_device_info.valid) { + return _input_audio_device_info.max_channels; + } + return 128; } uint32_t -AlsaAudioBackend::available_output_channel_count (const std::string&) const +AlsaAudioBackend::available_output_channel_count (const std::string& device) const +{ + if (device == get_standard_device_name(DeviceNone)) { + return 0; + } + if (device == _output_audio_device && _output_audio_device_info.valid) { + return _output_audio_device_info.max_channels; + } + return 128; +} + +std::vector +AlsaAudioBackend::available_period_sizes (const std::string& driver) const { - return 128; // TODO query current device + std::vector ps; + ps.push_back (2); + ps.push_back (3); + return ps; } bool @@ -222,16 +350,80 @@ AlsaAudioBackend::can_change_sample_rate_when_running () const bool AlsaAudioBackend::can_change_buffer_size_when_running () const { - return false; + return false; // why not? :) } int -AlsaAudioBackend::set_device_name (const std::string& d) +AlsaAudioBackend::set_input_device_name (const std::string& d) +{ + if (_input_audio_device == d) { + return 0; + } + _input_audio_device = d; + + if (d == get_standard_device_name(DeviceNone)) { + _input_audio_device_info.valid = false; + return 0; + } + std::string alsa_device; + std::map devices; + + get_alsa_audio_device_names(devices, HalfDuplexIn); + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + if (i->first == d) { + alsa_device = i->second; + break; + } + } + if (alsa_device == "") { + _input_audio_device_info.valid = false; + return 1; + } + /* device will be busy once used, hence cache the parameters */ + /* return */ get_alsa_device_parameters (alsa_device.c_str(), true, &_input_audio_device_info); + return 0; +} + +int +AlsaAudioBackend::set_output_device_name (const std::string& d) { - _audio_device = d; + if (_output_audio_device == d) { + return 0; + } + + _output_audio_device = d; + + if (d == get_standard_device_name(DeviceNone)) { + _output_audio_device_info.valid = false; + return 0; + } + std::string alsa_device; + std::map devices; + + get_alsa_audio_device_names(devices, HalfDuplexOut); + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + if (i->first == d) { + alsa_device = i->second; + break; + } + } + if (alsa_device == "") { + _output_audio_device_info.valid = false; + return 1; + } + /* return */ get_alsa_device_parameters (alsa_device.c_str(), true, &_output_audio_device_info); return 0; } +int +AlsaAudioBackend::set_device_name (const std::string& d) +{ + int rv = 0; + rv |= set_input_device_name (d); + rv |= set_output_device_name (d); + return rv; +} + int AlsaAudioBackend::set_sample_rate (float sr) { @@ -241,12 +433,28 @@ 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) { if (bs <= 0 || bs >= _max_buffer_size) { return -1; } + if (_run) { + return -1; + } _samples_per_period = bs; engine.buffer_size_change (bs); return 0; @@ -276,22 +484,115 @@ AlsaAudioBackend::set_output_channels (uint32_t cc) int AlsaAudioBackend::set_systemic_input_latency (uint32_t sl) { - _systemic_input_latency = sl; + _systemic_audio_input_latency = sl; + if (_run) { + update_systemic_audio_latencies(); + } return 0; } int AlsaAudioBackend::set_systemic_output_latency (uint32_t sl) { - _systemic_output_latency = sl; + _systemic_audio_output_latency = sl; + if (_run) { + update_systemic_audio_latencies(); + } + return 0; +} + +int +AlsaAudioBackend::set_systemic_midi_input_latency (std::string const device, uint32_t sl) +{ + 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; +} + +int +AlsaAudioBackend::set_systemic_midi_output_latency (std::string const device, uint32_t sl) +{ + 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 { - return _audio_device; + if (_input_audio_device != get_standard_device_name(DeviceNone)) { + return _input_audio_device; + } + if (_output_audio_device != get_standard_device_name(DeviceNone)) { + return _output_audio_device; + } + return ""; +} + +std::string +AlsaAudioBackend::input_device_name () const +{ + return _input_audio_device; +} + +std::string +AlsaAudioBackend::output_device_name () const +{ + return _output_audio_device; } float @@ -306,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 { @@ -327,44 +634,156 @@ AlsaAudioBackend::output_channels () const uint32_t AlsaAudioBackend::systemic_input_latency () const { - return _systemic_input_latency; + return _systemic_audio_input_latency; } uint32_t AlsaAudioBackend::systemic_output_latency () const { - return _systemic_output_latency; + return _systemic_audio_output_latency; +} + +uint32_t +AlsaAudioBackend::systemic_midi_input_latency (std::string const device) const +{ + struct AlsaMidiDeviceInfo * nfo = midi_device_info(device); + if (!nfo) return 0; + return nfo->systemic_input_latency; +} + +uint32_t +AlsaAudioBackend::systemic_midi_output_latency (std::string const device) const +{ + struct AlsaMidiDeviceInfo * nfo = midi_device_info(device); + if (!nfo) return 0; + return nfo->systemic_output_latency; } /* MIDI */ +struct AlsaAudioBackend::AlsaMidiDeviceInfo * +AlsaAudioBackend::midi_device_info(std::string const name) const { + for (std::map::const_iterator i = _midi_devices.begin (); i != _midi_devices.end(); ++i) { + if (i->first == name) { + return (i->second); + } + } + + assert(_midi_driver_option != get_standard_device_name(DeviceNone)); + + std::map devices; + if (_midi_driver_option == _("ALSA raw devices")) { + get_alsa_rawmidi_device_names(devices); + } else { + get_alsa_sequencer_names (devices); + } + + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + if (i->first == name) { + _midi_devices[name] = new AlsaMidiDeviceInfo(); + return _midi_devices[name]; + } + } + return 0; +} + std::vector AlsaAudioBackend::enumerate_midi_options () const { - std::vector m; - m.push_back (_("-None-")); + if (_midi_options.empty()) { + _midi_options.push_back (_("ALSA raw devices")); + _midi_options.push_back (_("ALSA sequencer")); + _midi_options.push_back (get_standard_device_name(DeviceNone)); + } + return _midi_options; +} + +std::vector +AlsaAudioBackend::enumerate_midi_devices () const +{ + _midi_device_status.clear(); std::map devices; - get_alsa_rawmidi_device_names(devices); - for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { - m.push_back (i->first); + if (_midi_driver_option == _("ALSA raw devices")) { + get_alsa_rawmidi_device_names (devices); + } + else if (_midi_driver_option == _("ALSA sequencer")) { + get_alsa_sequencer_names (devices); } - if (m.size() > 2) { - m.push_back (_("-All-")); + + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { + _midi_device_status.push_back (DeviceStatus (i->first, true)); } - return m; + return _midi_device_status; } int AlsaAudioBackend::set_midi_option (const std::string& opt) { - _midi_device = 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; } std::string AlsaAudioBackend::midi_option () const { - return _midi_device; + return _midi_driver_option; +} + +int +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; +} + +bool +AlsaAudioBackend::midi_device_enabled (std::string const device) const +{ + struct AlsaMidiDeviceInfo * nfo = midi_device_info(device); + if (!nfo) return false; + return nfo->enabled; } /* State Control */ @@ -380,9 +799,14 @@ static void * pthread_process (void *arg) int AlsaAudioBackend::_start (bool for_latency_measurement) { + if (!_active && _run) { + // recover from 'halted', reap threads + stop(); + } + if (_active || _run) { PBD::error << _("AlsaAudioBackend: already active.") << endmsg; - return -1; + return BackendReinitializationError; } if (_ports.size()) { @@ -394,38 +818,109 @@ AlsaAudioBackend::_start (bool for_latency_measurement) _ports.clear(); } + /* reset internal state */ + _dsp_load = 0; + _freewheeling = false; + _freewheel = false; + _last_process_start = 0; + release_device(); assert(_rmidi_in.size() == 0); assert(_rmidi_out.size() == 0); assert(_pcmi == 0); + int duplex = 0; + std::string audio_device; std::string alsa_device; std::map devices; - get_alsa_audio_device_names(devices); + + 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 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 AudioDeviceInvalidError; + } + if (_input_audio_device != get_standard_device_name(DeviceNone)) { + get_alsa_audio_device_names(devices, HalfDuplexIn); + audio_device = _input_audio_device; + duplex = 1; + } else { + get_alsa_audio_device_names(devices, HalfDuplexOut); + audio_device = _output_audio_device; + duplex = 2; + } + } else { + get_alsa_audio_device_names(devices); + audio_device = _input_audio_device; + duplex = 3; + } + for (std::map::const_iterator i = devices.begin (); i != devices.end(); ++i) { - if (i->first == _audio_device) { + if (i->first == audio_device) { alsa_device = i->second; break; } } + if (alsa_device == "") { + PBD::error << _("AlsaAudioBackend: Cannot find configured device. Is it still connected?"); + return AudioDeviceNotAvailableError; + } acquire_device(alsa_device.c_str()); - _pcmi = new Alsa_pcmi (alsa_device.c_str(), alsa_device.c_str(), 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; + _pcmi = new Alsa_pcmi ( + (duplex & 2) ? alsa_device.c_str() : NULL, + (duplex & 1) ? alsa_device.c_str() : NULL, + /* 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 @@ -461,18 +956,16 @@ AlsaAudioBackend::_start (bool for_latency_measurement) PBD::warning << _("AlsaAudioBackend: sample rate does not match.") << endmsg; } - if (for_latency_measurement) { - _systemic_input_latency = 0; - _systemic_output_latency = 0; - } + _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); @@ -482,13 +975,14 @@ 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 (); _run = true; + _port_change_flag = false; - if (_realtime_pthread_create (SCHED_FIFO, -20, + if (_realtime_pthread_create (SCHED_FIFO, -20, 100000, &_main_thread, pthread_process, this)) { if (pthread_create (&_main_thread, NULL, pthread_process, this)) @@ -497,7 +991,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; } @@ -511,17 +1005,17 @@ AlsaAudioBackend::_start (bool for_latency_measurement) delete _pcmi; _pcmi = 0; release_device(); _run = false; - return -1; + return ProcessThreadStartError; } - return 0; + return NoError; } int AlsaAudioBackend::stop () { void *status; - if (!_active) { + if (!_run) { return 0; } @@ -532,20 +1026,21 @@ AlsaAudioBackend::stop () } while (!_rmidi_out.empty ()) { - AlsaRawMidiIO *m = _rmidi_out.back (); + AlsaMidiIO *m = _rmidi_out.back (); m->stop(); _rmidi_out.pop_back (); delete m; } while (!_rmidi_in.empty ()) { - AlsaRawMidiIO *m = _rmidi_in.back (); + AlsaMidiIO *m = _rmidi_in.back (); m->stop(); _rmidi_in.pop_back (); delete m; } - unregister_system_ports(); + unregister_ports(); delete _pcmi; _pcmi = 0; + _midi_ins = _midi_outs = 0; release_device(); return (_active == false) ? 0 : -1; @@ -554,11 +1049,7 @@ AlsaAudioBackend::stop () int AlsaAudioBackend::freewheel (bool onoff) { - if (onoff == _freewheeling) { - return 0; - } _freewheeling = onoff; - engine.freewheel_callback (onoff); return 0; } @@ -581,13 +1072,13 @@ AlsaAudioBackend::raw_buffer_size (DataType t) } /* Process time */ -pframes_t +framepos_t AlsaAudioBackend::sample_time () { return _processed_samples; } -pframes_t +framepos_t AlsaAudioBackend::sample_time_at_cycle_start () { return _processed_samples; @@ -596,7 +1087,15 @@ AlsaAudioBackend::sample_time_at_cycle_start () pframes_t AlsaAudioBackend::samples_since_cycle_start () { - return 0; + if (!_active || !_run || _freewheeling || _freewheel) { + return 0; + } + if (_last_process_start == 0) { + return 0; + } + + const int64_t elapsed_time_us = g_get_monotonic_time() - _last_process_start; + return std::max((pframes_t)0, (pframes_t)rint(1e-6 * elapsed_time_us * _samplerate)); } @@ -617,16 +1116,19 @@ AlsaAudioBackend::create_process_thread (boost::function func) pthread_attr_t attr; size_t stacksize = 100000; - pthread_attr_init (&attr); - pthread_attr_setstacksize (&attr, stacksize); ThreadData* td = new ThreadData (this, func, stacksize); - if (pthread_create (&thread_id, &attr, alsa_process_thread, td)) { - PBD::error << _("AudioEngine: cannot create process thread.") << endmsg; + if (_realtime_pthread_create (SCHED_FIFO, -21, stacksize, + &thread_id, alsa_process_thread, td)) { + pthread_attr_init (&attr); + pthread_attr_setstacksize (&attr, stacksize); + if (pthread_create (&thread_id, &attr, alsa_process_thread, td)) { + PBD::error << _("AudioEngine: cannot create process thread.") << endmsg; + pthread_attr_destroy (&attr); + return -1; + } pthread_attr_destroy (&attr); - return -1; } - pthread_attr_destroy (&attr); _threads.push_back (thread_id); return 0; @@ -652,6 +1154,10 @@ AlsaAudioBackend::join_process_threads () bool AlsaAudioBackend::in_process_thread () { + if (pthread_equal (_main_thread, pthread_self()) != 0) { + return true; + } + for (std::vector::const_iterator i = _threads.begin (); i != _threads.end (); ++i) { if (pthread_equal (*i, pthread_self ()) != 0) { @@ -670,6 +1176,8 @@ AlsaAudioBackend::process_thread_count () void AlsaAudioBackend::update_latencies () { + // trigger latency callback in RT thread (locked graph) + port_connect_add_remove_callback(); } /* PORTENGINE API */ @@ -741,7 +1249,7 @@ AlsaAudioBackend::get_ports ( } for (size_t i = 0; i < _ports.size (); ++i) { AlsaPort* 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; @@ -807,8 +1315,8 @@ AlsaAudioBackend::add_port ( void AlsaAudioBackend::unregister_port (PortEngine::PortHandle port_handle) { - if (!valid_port (port_handle)) { - PBD::error << _("AlsaBackend::unregister_port: Invalid Port.") << endmsg; + if (!_run) { + return; } AlsaPort* port = static_cast(port_handle); std::vector::iterator i = std::find (_ports.begin (), _ports.end (), static_cast(port_handle)); @@ -826,11 +1334,13 @@ AlsaAudioBackend::register_system_audio_ports() { LatencyRange lr; - const int a_ins = _n_inputs > 0 ? _n_inputs : 2; - const int a_out = _n_outputs > 0 ? _n_outputs : 2; + 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 = _samples_per_period * _periods_per_cycle + _systemic_input_latency; + lr.min = lr.max = (_measure_latency ? 0 : _systemic_audio_input_latency); for (int i = 1; i <= a_ins; ++i) { char tmp[64]; snprintf(tmp, sizeof(tmp), "system:capture_%d", i); @@ -840,7 +1350,7 @@ AlsaAudioBackend::register_system_audio_ports() _system_inputs.push_back(static_cast(p)); } - lr.min = lr.max = _samples_per_period * _periods_per_cycle + _systemic_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); @@ -853,37 +1363,38 @@ AlsaAudioBackend::register_system_audio_ports() } int -AlsaAudioBackend::register_system_midi_ports() +AlsaAudioBackend::register_system_midi_ports(const std::string device) { - LatencyRange lr; - std::vector devices; + std::map devices; + + // TODO use consistent numbering when re-adding devices: _midi_ins, _midi_outs - if (_midi_device == _("-None-")) { + if (_midi_driver_option == get_standard_device_name(DeviceNone)) { return 0; - } - else if (_midi_device == _("-All-")) { - std::map devmap; - get_alsa_rawmidi_device_names(devmap); - for (std::map::const_iterator i = devmap.begin (); i != devmap.end(); ++i) { - devices.push_back (i->second); - } + } else if (_midi_driver_option == _("ALSA raw devices")) { + get_alsa_rawmidi_device_names(devices); } else { - std::map devmap; - get_alsa_rawmidi_device_names(devmap); - for (std::map::const_iterator i = devmap.begin (); i != devmap.end(); ++i) { - if (i->first == _midi_device) { - devices.push_back (i->second); - break; - } - } + get_alsa_sequencer_names (devices); } - for (std::vector::const_iterator i = devices.begin (); i != devices.end (); ++i) { + 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->first, i->second.c_str()); + } else { + mout = new AlsaSeqMidiOut (i->first, i->second.c_str()); + } - AlsaRawMidiOut *mout = new AlsaRawMidiOut (i->c_str()); if (mout->state ()) { PBD::warning << string_compose ( - _("AlsaRawMidiOut: failed to open midi device '%1'."), *i) + _("AlsaMidiOut: failed to open midi device '%1'."), i->second) << endmsg; delete mout; } else { @@ -891,18 +1402,36 @@ AlsaAudioBackend::register_system_midi_ports() mout->sync_time (g_get_monotonic_time()); if (mout->start ()) { PBD::warning << string_compose ( - _("AlsaRawMidiOut: failed to start midi device '%1'."), *i) + _("AlsaMidiOut: failed to start midi device '%1'."), i->second) << endmsg; delete mout; } else { + char tmp[64]; + 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(); + delete mout; + } + LatencyRange lr; + lr.min = lr.max = (_measure_latency ? 0 : nfo->systemic_output_latency); + set_latency_range (p, true, lr); + static_cast(p)->set_n_periods(_periods_per_cycle); // TODO check MIDI alignment + _system_midi_out.push_back(static_cast(p)); _rmidi_out.push_back (mout); } } - AlsaRawMidiIn *midin = new AlsaRawMidiIn (i->c_str()); + AlsaMidiIn *midin; + if (_midi_driver_option == _("ALSA raw devices")) { + midin = new AlsaRawMidiIn (i->first, i->second.c_str()); + } else { + midin = new AlsaSeqMidiIn (i->first, i->second.c_str()); + } + if (midin->state ()) { PBD::warning << string_compose ( - _("AlsaRawMidiIn: failed to open midi device '%1'."), *i) + _("AlsaMidiIn: failed to open midi device '%1'."), i->second) << endmsg; delete midin; } else { @@ -910,43 +1439,31 @@ AlsaAudioBackend::register_system_midi_ports() midin->sync_time (g_get_monotonic_time()); if (midin->start ()) { PBD::warning << string_compose ( - _("AlsaRawMidiIn: failed to start midi device '%1'."), *i) + _("AlsaMidiIn: failed to start midi device '%1'."), i->second) << endmsg; delete midin; } else { + char tmp[64]; + 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(); + delete midin; + continue; + } + 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)); _rmidi_in.push_back (midin); } } } - - const int m_ins = _rmidi_in.size(); - const int m_out = _rmidi_out.size(); - - lr.min = lr.max = _samples_per_period + _systemic_input_latency; - for (int i = 1; i <= m_ins; ++i) { - char tmp[64]; - snprintf(tmp, sizeof(tmp), "system:midi_capture_%d", i); - PortHandle p = add_port(std::string(tmp), DataType::MIDI, static_cast(IsOutput | IsPhysical | IsTerminal)); - if (!p) return -1; - set_latency_range (p, false, lr); - _system_midi_in.push_back(static_cast(p)); - } - - lr.min = lr.max = _samples_per_period + _systemic_output_latency; - for (int i = 1; i <= m_out; ++i) { - char tmp[64]; - snprintf(tmp, sizeof(tmp), "system:midi_playback_%d", i); - PortHandle p = add_port(std::string(tmp), DataType::MIDI, static_cast(IsInput | IsPhysical | IsTerminal)); - if (!p) return -1; - set_latency_range (p, true, lr); - _system_midi_out.push_back(static_cast(p)); - } - return 0; } void -AlsaAudioBackend::unregister_system_ports() +AlsaAudioBackend::unregister_ports (bool system_only) { size_t i = 0; _system_inputs.clear(); @@ -955,8 +1472,9 @@ AlsaAudioBackend::unregister_system_ports() _system_midi_out.clear(); while (i < _ports.size ()) { AlsaPort* port = _ports[i]; - if (port->is_physical () && port->is_terminal ()) { + if (! system_only || (port->is_physical () && port->is_terminal ())) { port->disconnect_all (); + delete port; _ports.erase (_ports.begin() + i); } else { ++i; @@ -1113,9 +1631,11 @@ AlsaAudioBackend::midi_event_put ( assert (buffer && port_buffer); AlsaMidiBuffer& dst = * static_cast(port_buffer); if (dst.size () && (pframes_t)dst.back ()->timestamp () > timestamp) { +#ifndef NDEBUG + // nevermind, ::get_buffer() sorts events fprintf (stderr, "AlsaMidiBuffer: it's too late for this event. %d > %d\n", (pframes_t)dst.back ()->timestamp (), timestamp); - return -1; +#endif } dst.push_back (boost::shared_ptr(new AlsaMidiEvent (timestamp, buffer, size))); return 0; @@ -1177,14 +1697,28 @@ AlsaAudioBackend::set_latency_range (PortEngine::PortHandle port, bool for_playb LatencyRange AlsaAudioBackend::get_latency_range (PortEngine::PortHandle port, bool for_playback) { + LatencyRange r; if (!valid_port (port)) { PBD::error << _("AlsaPort::get_latency_range (): invalid port.") << endmsg; - LatencyRange r; r.min = 0; r.max = 0; return r; } - return static_cast(port)->latency_range (for_playback); + AlsaPort *p = static_cast(port); + assert(p); + + r = p->latency_range (for_playback); + if (p->is_physical() && p->is_terminal()) { + 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 */ @@ -1281,28 +1815,44 @@ AlsaAudioBackend::main_process_thread () _active = true; _processed_samples = 0; - uint64_t clock1, clock2; - clock1 = g_get_monotonic_time(); + uint64_t clock1; _pcmi->pcm_start (); int no_proc_errors = 0; + const int bailout = 2 * _samplerate / _samples_per_period; + manager.registration_callback(); manager.graph_order_callback(); while (_run) { long nr; bool xrun = false; - if (!_freewheeling) { + + if (_freewheeling != _freewheel) { + _freewheel = _freewheeling; + engine.freewheel_callback (_freewheel); + } + + if (!_freewheel) { nr = _pcmi->pcm_wait (); if (_pcmi->state () > 0) { ++no_proc_errors; xrun = true; } - if (_pcmi->state () < 0 || no_proc_errors > 50) { + if (_pcmi->state () < 0) { PBD::error << _("AlsaAudioBackend: I/O error. Audio Process Terminated.") << endmsg; break; } - while (nr >= (long)_samples_per_period) { + if (no_proc_errors > bailout) { + PBD::error + << string_compose ( + _("AlsaAudioBackend: Audio Process Terminated after %1 consecutive x-runs."), + no_proc_errors) + << endmsg; + break; + } + + while (nr >= (long)_samples_per_period && _freewheeling == _freewheel) { uint32_t i = 0; clock1 = g_get_monotonic_time(); no_proc_errors = 0; @@ -1313,14 +1863,14 @@ AlsaAudioBackend::main_process_thread () } _pcmi->capt_done (_samples_per_period); - /* de-queue midi*/ + /* de-queue incoming midi*/ i = 0; for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it, ++i) { assert (_rmidi_in.size() > i); - AlsaRawMidiIn *rm = static_cast(_rmidi_in.at(i)); + AlsaMidiIn *rm = _rmidi_in.at(i); void *bptr = (*it)->get_buffer(0); pframes_t time; - uint8_t data[64]; // match MaxAlsaRawEventSize in alsa_rawmidi.cc + uint8_t data[64]; // match MaxAlsaEventSize in alsa_rawmidi.cc size_t size = sizeof(data); midi_clear(bptr); while (rm->recv_event (time, data, size)) { @@ -1334,19 +1884,25 @@ AlsaAudioBackend::main_process_thread () memset ((*it)->get_buffer (_samples_per_period), 0, _samples_per_period * sizeof (Sample)); } + /* call engine process callback */ + _last_process_start = g_get_monotonic_time(); if (engine.process_callback (_samples_per_period)) { _pcmi->pcm_stop (); _active = false; return 0; } - /* queue midi*/ + for (std::vector::iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it) { + static_cast(*it)->next_period(); + } + + /* queue outgoing midi */ i = 0; for (std::vector::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it, ++i) { assert (_rmidi_out.size() > i); - AlsaRawMidiOut *rm = static_cast(_rmidi_out.at(i)); - const AlsaMidiBuffer *src = static_cast((*it)->get_buffer(0)); - rm->sync_time (clock1); // ?? use clock pre DSP load? + const AlsaMidiBuffer * src = static_cast(*it)->const_buffer(); + AlsaMidiOut *rm = _rmidi_out.at(i); + rm->sync_time (clock1); for (AlsaMidiBuffer::const_iterator mit = src->begin (); mit != src->end (); ++mit) { rm->send_event ((*mit)->timestamp(), (*mit)->data(), (*mit)->size()); } @@ -1365,38 +1921,72 @@ AlsaAudioBackend::main_process_thread () nr -= _samples_per_period; _processed_samples += _samples_per_period; - /* calculate DSP load */ - clock2 = g_get_monotonic_time(); - const int64_t elapsed_time = clock2 - clock1; - const int64_t nomial_time = 1e6 * _samples_per_period / _samplerate; - _dsp_load = elapsed_time / (float) nomial_time; + _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 (); } if (xrun && (_pcmi->capt_xrun() > 0 || _pcmi->play_xrun() > 0)) { engine.Xrun (); #if 0 - fprintf(stderr, "ALSA x-run read: %.1f ms, write: %.1f ms\n", + fprintf(stderr, "ALSA x-run read: %.2f ms, write: %.2f ms\n", _pcmi->capt_xrun() * 1000.0, _pcmi->play_xrun() * 1000.0); #endif } } else { // Freewheelin' + + // zero audio input buffers for (std::vector::const_iterator it = _system_inputs.begin (); it != _system_inputs.end (); ++it) { memset ((*it)->get_buffer (_samples_per_period), 0, _samples_per_period * sizeof (Sample)); } - for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it) { + + clock1 = g_get_monotonic_time(); + uint32_t i = 0; + for (std::vector::const_iterator it = _system_midi_in.begin (); it != _system_midi_in.end (); ++it, ++i) { static_cast((*it)->get_buffer(0))->clear (); + AlsaMidiIn *rm = _rmidi_in.at(i); + void *bptr = (*it)->get_buffer(0); + midi_clear(bptr); // zero midi buffer + + // TODO add an API call for this. + pframes_t time; + uint8_t data[64]; // match MaxAlsaEventSize in alsa_rawmidi.cc + size_t size = sizeof(data); + while (rm->recv_event (time, data, size)) { + ; // discard midi-data from HW. + } + rm->sync_time (clock1); } + _last_process_start = 0; if (engine.process_callback (_samples_per_period)) { _pcmi->pcm_stop (); + _active = false; return 0; } + + // drop all outgoing MIDI messages + for (std::vector::const_iterator it = _system_midi_out.begin (); it != _system_midi_out.end (); ++it) { + void *bptr = (*it)->get_buffer(0); + midi_clear(bptr); + } + _dsp_load = 1.0; Glib::usleep (100); // don't hog cpu } + bool connections_changed = false; + bool ports_changed = false; if (!pthread_mutex_trylock (&_port_callback_mutex)) { + if (_port_change_flag) { + ports_changed = true; + _port_change_flag = false; + } + if (!_port_connection_queue.empty ()) { + connections_changed = true; + } while (!_port_connection_queue.empty ()) { PortConnectData *c = _port_connection_queue.back (); manager.connect_callback (c->a, c->b, c->c); @@ -1405,6 +1995,16 @@ AlsaAudioBackend::main_process_thread () } pthread_mutex_unlock (&_port_callback_mutex); } + if (ports_changed) { + manager.registration_callback(); + } + if (connections_changed) { + manager.graph_order_callback(); + } + if (connections_changed || ports_changed) { + engine.latency_callback(false); + engine.latency_callback(true); + } } _pcmi->pcm_stop (); @@ -1424,13 +2024,15 @@ static boost::shared_ptr backend_factory (AudioEngine& e); static int instantiate (const std::string& arg1, const std::string& /* arg2 */); static int deinstantiate (); static bool already_configured (); +static bool available (); static ARDOUR::AudioBackendInfo _descriptor = { - "Alsa", + "ALSA", instantiate, deinstantiate, backend_factory, already_configured, + available }; static boost::shared_ptr @@ -1462,6 +2064,12 @@ already_configured () return false; } +static bool +available () +{ + return true; +} + extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor () { return &_descriptor; @@ -1630,8 +2238,11 @@ void* AlsaAudioPort::get_buffer (pframes_t n_samples) AlsaMidiPort::AlsaMidiPort (AlsaAudioBackend &b, const std::string& name, PortFlags flags) : AlsaPort (b, name, flags) + , _n_periods (1) + , _bufperiod (0) { - _buffer.clear (); + _buffer[0].clear (); + _buffer[1].clear (); } AlsaMidiPort::~AlsaMidiPort () { } @@ -1645,18 +2256,18 @@ struct MidiEventSorter { void* AlsaMidiPort::get_buffer (pframes_t /* nframes */) { if (is_input ()) { - _buffer.clear (); + (_buffer[_bufperiod]).clear (); for (std::vector::const_iterator i = get_connections ().begin (); i != get_connections ().end (); ++i) { - const AlsaMidiBuffer src = static_cast(*i)->const_buffer (); - for (AlsaMidiBuffer::const_iterator it = src.begin (); it != src.end (); ++it) { - _buffer.push_back (boost::shared_ptr(new AlsaMidiEvent (**it))); + const AlsaMidiBuffer * src = static_cast(*i)->const_buffer (); + for (AlsaMidiBuffer::const_iterator it = src->begin (); it != src->end (); ++it) { + (_buffer[_bufperiod]).push_back (boost::shared_ptr(new AlsaMidiEvent (**it))); } } - std::sort (_buffer.begin (), _buffer.end (), MidiEventSorter()); + std::sort ((_buffer[_bufperiod]).begin (), (_buffer[_bufperiod]).end (), MidiEventSorter()); } - return &_buffer; + return &(_buffer[_bufperiod]); } AlsaMidiEvent::AlsaMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size)