From ac923be7af7acf6e677cf76b162d5a8d315a7614 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 8 Jul 2016 21:31:52 +0200 Subject: fix port-sort order for good. TODO find out how to make std::set::find() work with custom sort order, as std::find may only be O(N) and not O(log (N)). --- libs/backends/alsa/alsa_audiobackend.cc | 2 +- libs/backends/alsa/alsa_audiobackend.h | 2 +- libs/backends/coreaudio/coreaudio_backend.cc | 2 +- libs/backends/coreaudio/coreaudio_backend.h | 2 +- libs/backends/dummy/dummy_audiobackend.cc | 2 +- libs/backends/dummy/dummy_audiobackend.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libs') diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index ed8254e3e3..8e34428db3 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -1362,7 +1362,7 @@ AlsaAudioBackend::unregister_port (PortEngine::PortHandle port_handle) return; } AlsaPort* port = static_cast(port_handle); - PortIndex::iterator i = _ports.find (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; diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h index 2a2cc94046..f7f7f693bb 100644 --- a/libs/backends/alsa/alsa_audiobackend.h +++ b/libs/backends/alsa/alsa_audiobackend.h @@ -454,7 +454,7 @@ class AlsaAudioBackend : public AudioBackend { } bool valid_port (PortHandle port) const { - return _ports.find (static_cast(port)) != _ports.end (); + return std::find (_ports.begin(), _ports.end(), static_cast(port)) != _ports.end (); } AlsaPort* find_port (const std::string& port_name) const { diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index f87282c995..b22049e247 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -1054,7 +1054,7 @@ CoreAudioBackend::unregister_port (PortEngine::PortHandle port_handle) return; } CoreBackendPort* port = static_cast(port_handle); - PortIndex::iterator i = _ports.find (static_cast(port_handle)); + PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast(port_handle)); if (i == _ports.end ()) { PBD::warning << _("CoreAudioBackend::unregister_port: Failed to find port") << endmsg; return; diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index 58e81342c1..643604030b 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -505,7 +505,7 @@ class CoreAudioBackend : public AudioBackend { } bool valid_port (PortHandle port) const { - return _ports.find (static_cast(port)) != _ports.end (); + return std::find (_ports.begin(), _ports.end(), static_cast(port)) != _ports.end (); } CoreBackendPort* find_port (const std::string& port_name) const { diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index 0d3567f3e7..801c8045d9 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -809,7 +809,7 @@ DummyAudioBackend::unregister_port (PortEngine::PortHandle port_handle) return; } DummyPort* port = static_cast(port_handle); - PortIndex::iterator i = _ports.find (static_cast(port_handle)); + PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast(port_handle)); if (i == _ports.end ()) { PBD::error << _("DummyBackend::unregister_port: Failed to find port") << endmsg; return; diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h index 12abe7be92..fbb55b48ba 100644 --- a/libs/backends/dummy/dummy_audiobackend.h +++ b/libs/backends/dummy/dummy_audiobackend.h @@ -490,7 +490,7 @@ class DummyAudioBackend : public AudioBackend { } bool valid_port (PortHandle port) const { - return _ports.find (static_cast(port)) != _ports.end (); + return std::find (_ports.begin(), _ports.end(), static_cast(port)) != _ports.end (); } DummyPort* find_port (const std::string& port_name) const { -- cgit v1.2.3