smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Further reduce DSP load of debug builds

Browse source 
In all years of using these assert()s never triggered. Besides
there are valid_port() tests in other strategic locations that
are not periodically hit in realtime context.
This commit is contained in:
Robin Gareus 2022-05-06 01:25:05 +02:00
parent ed21ea8fc6
commit 226dadbd19
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/port.cc
View file

@ -219,7 +219,7 @@ Port::connected_to (std::string const & o) const
return false; return false;
} }
return port_engine.connected_to (_port_handle, AudioEngine::instance()->make_port_name_non_relative (o)); return port_engine.connected_to (_port_handle, AudioEngine::instance()->make_port_name_non_relative (o), true);
} }
int int

4
libs/ardour/port_engine_shared.cc
View file

@ -748,12 +748,12 @@ PortEngineSharedImpl::connected (PortEngine::PortHandle port_handle, bool /* pro
} }
bool bool
PortEngineSharedImpl::connected_to (PortEngine::PortHandle src, const std::string& dst, bool /*process_callback_safe*/) PortEngineSharedImpl::connected_to (PortEngine::PortHandle src, const std::string& dst, bool process_callback_safe)
{ {
BackendPortPtr src_port = boost::dynamic_pointer_cast<BackendPort> (src); BackendPortPtr src_port = boost::dynamic_pointer_cast<BackendPort> (src);
BackendPortPtr dst_port = find_port (dst); BackendPortPtr dst_port = find_port (dst);
#ifndef NDEBUG #ifndef NDEBUG
if (!valid_port (src_port) || !dst_port) { if (!process_callback_safe && (!valid_port (src_port) || !dst_port)) {
PBD::error << string_compose (_("%1::connected_to: Invalid Port"), _instance_name) << endmsg; PBD::error << string_compose (_("%1::connected_to: Invalid Port"), _instance_name) << endmsg;
return false; return false;
} }

1
libs/backends/alsa/alsa_audiobackend.cc
View file

@ -1790,7 +1790,6 @@ AlsaAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nfra
{ {
BackendPortPtr port = boost::dynamic_pointer_cast<BackendPort> (port_handle); BackendPortPtr port = boost::dynamic_pointer_cast<BackendPort> (port_handle);
assert (port); assert (port);
assert (valid_port (port));
return port->get_buffer (nframes); return port->get_buffer (nframes);
} }

1
libs/backends/coreaudio/coreaudio_backend.cc
View file

@ -1218,7 +1218,6 @@ CoreAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nfra
{ {
boost::shared_ptr<BackendPort> port = boost::dynamic_pointer_cast<BackendPort> (port_handle); boost::shared_ptr<BackendPort> port = boost::dynamic_pointer_cast<BackendPort> (port_handle);
assert (port); assert (port);
assert (valid_port (port));
if (!port || !valid_port (port)) return NULL; // XXX remove me if (!port || !valid_port (port)) return NULL; // XXX remove me
return port->get_buffer (nframes); return port->get_buffer (nframes);
} }

1
libs/backends/portaudio/portaudio_backend.cc
View file

@ -1446,7 +1446,6 @@ PortAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nfra
{ {
boost::shared_ptr<BackendPort> port = boost::dynamic_pointer_cast<BackendPort>(port_handle); boost::shared_ptr<BackendPort> port = boost::dynamic_pointer_cast<BackendPort>(port_handle);
assert (port); assert (port);
assert (valid_port (port));
if (!port || !valid_port (port)) return NULL; // XXX remove me if (!port || !valid_port (port)) return NULL; // XXX remove me
return port->get_buffer (nframes); return port->get_buffer (nframes);
} }

1
libs/backends/pulseaudio/pulseaudio_backend.cc
View file

@ -981,7 +981,6 @@ PulseAudioBackend::get_buffer (PortEngine::PortHandle port_handle, pframes_t nfr
BackendPortPtr port = boost::dynamic_pointer_cast<BackendPort> (port_handle); BackendPortPtr port = boost::dynamic_pointer_cast<BackendPort> (port_handle);
assert (port); assert (port);
assert (valid_port (port));
return port->get_buffer (nframes); return port->get_buffer (nframes);
} }