From 56cc3e24071f504c7dcc2f6fd7bf98468c30c7ac Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 3 May 2015 22:34:52 +0200 Subject: [PATCH] fix portengin get_ports() flags API require all flags to be present (same as jack) --- libs/backends/alsa/alsa_audiobackend.cc | 2 +- libs/backends/coreaudio/coreaudio_backend.cc | 2 +- libs/backends/dummy/dummy_audiobackend.cc | 2 +- libs/backends/portaudio/portaudio_backend.cc | 2 +- libs/backends/wavesaudio/waves_audiobackend.port_engine.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index be0bbaf2f5..a2ed9f8b07 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -868,7 +868,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; diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 0593a35e40..d22d067e38 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -779,7 +779,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; diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index a42f3dbade..680c5a6873 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -640,7 +640,7 @@ DummyAudioBackend::get_ports ( } for (size_t i = 0; i < _ports.size (); ++i) { DummyPort* 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; diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index f94c819b22..0277ca1270 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -649,7 +649,7 @@ PortAudioBackend::get_ports ( } for (size_t i = 0; i < _ports.size (); ++i) { PamPort* 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; diff --git a/libs/backends/wavesaudio/waves_audiobackend.port_engine.cc b/libs/backends/wavesaudio/waves_audiobackend.port_engine.cc index 556e38d379..84340953da 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.port_engine.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.port_engine.cc @@ -96,7 +96,7 @@ WavesAudioBackend::get_ports (const std::string& port_name_pattern, DataType typ for (size_t i = 0; i < _ports.size (); ++i) { WavesDataPort* port = _ports[i]; - if ((port->type () == type) && (port->flags () & flags)) { + if ((port->type () == type) && flags == (port->flags () & flags)) { port_names.push_back (port->name ()); found_ports++; }