ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix port-sort order for good.

Browse Source 
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)).
This commit is contained in:
Robin Gareus 2016-07-08 21:31:52 +02:00
parent 97b1725023
commit ac923be7af
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/backends/alsa/alsa_audiobackend.cc
View File

@ -1362,7 +1362,7 @@ AlsaAudioBackend::unregister_port (PortEngine::PortHandle port_handle)
return;
}
AlsaPort* port = static_cast<AlsaPort*>(port_handle);
PortIndex::iterator i = _ports.find (static_cast<AlsaPort*>(port_handle));
PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast<AlsaPort*>(port_handle));
if (i == _ports.end ()) {
PBD::error << _("AlsaBackend::unregister_port: Failed to find port") << endmsg;
return;

2
libs/backends/alsa/alsa_audiobackend.h
View File

@ -454,7 +454,7 @@ class AlsaAudioBackend : public AudioBackend {
}
bool valid_port (PortHandle port) const {
return _ports.find (static_cast<AlsaPort*>(port)) != _ports.end ();
return std::find (_ports.begin(), _ports.end(), static_cast<AlsaPort*>(port)) != _ports.end ();
}
AlsaPort* find_port (const std::string& port_name) const {

2
libs/backends/coreaudio/coreaudio_backend.cc
View File

@ -1054,7 +1054,7 @@ CoreAudioBackend::unregister_port (PortEngine::PortHandle port_handle)
return;
}
CoreBackendPort* port = static_cast<CoreBackendPort*>(port_handle);
PortIndex::iterator i = _ports.find (static_cast<CoreBackendPort*>(port_handle));
PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast<CoreBackendPort*>(port_handle));
if (i == _ports.end ()) {
PBD::warning << _("CoreAudioBackend::unregister_port: Failed to find port") << endmsg;
return;

2
libs/backends/coreaudio/coreaudio_backend.h
View File

@ -505,7 +505,7 @@ class CoreAudioBackend : public AudioBackend {
}
bool valid_port (PortHandle port) const {
return _ports.find (static_cast<CoreBackendPort*>(port)) != _ports.end ();
return std::find (_ports.begin(), _ports.end(), static_cast<CoreBackendPort*>(port)) != _ports.end ();
}
CoreBackendPort* find_port (const std::string& port_name) const {

2
libs/backends/dummy/dummy_audiobackend.cc
View File

@ -809,7 +809,7 @@ DummyAudioBackend::unregister_port (PortEngine::PortHandle port_handle)
return;
}
DummyPort* port = static_cast<DummyPort*>(port_handle);
PortIndex::iterator i = _ports.find (static_cast<DummyPort*>(port_handle));
PortIndex::iterator i = std::find (_ports.begin(), _ports.end(), static_cast<DummyPort*>(port_handle));
if (i == _ports.end ()) {
PBD::error << _("DummyBackend::unregister_port: Failed to find port") << endmsg;
return;

2
libs/backends/dummy/dummy_audiobackend.h
View File

@ -490,7 +490,7 @@ class DummyAudioBackend : public AudioBackend {
}
bool valid_port (PortHandle port) const {
return _ports.find (static_cast<DummyPort*>(port)) != _ports.end ();
return std::find (_ports.begin(), _ports.end(), static_cast<DummyPort*>(port)) != _ports.end ();
}
DummyPort* find_port (const std::string& port_name) const {