From 076e9fddd4ece79b3b7de9ca0aa5283c9badbb47 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 28 Nov 2018 15:32:40 +0100 Subject: [PATCH] Remove ambiguous API implementation * PortEngine::available() implementation * AudioEngine::connected() wrapper Eventually we may re-introduce PortEngine::available along with a libardour internal port-engine. --- libs/ardour/ardour/audioengine.h | 1 - libs/ardour/ardour/port_engine.h | 6 ------ libs/ardour/audioengine.cc | 10 ---------- libs/backends/alsa/alsa_audiobackend.cc | 6 ------ libs/backends/alsa/alsa_audiobackend.h | 1 - libs/backends/coreaudio/coreaudio_backend.cc | 6 ------ libs/backends/coreaudio/coreaudio_backend.h | 1 - libs/backends/dummy/dummy_audiobackend.cc | 6 ------ libs/backends/dummy/dummy_audiobackend.h | 1 - libs/backends/jack/jack_audiobackend.h | 3 ++- libs/backends/portaudio/portaudio_backend.cc | 6 ------ libs/backends/portaudio/portaudio_backend.h | 1 - 12 files changed, 2 insertions(+), 46 deletions(-) diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 4548ad7391..664309e935 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -123,7 +123,6 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr void launch_device_control_app(); bool is_realtime() const; - bool connected() const; // for the user which hold state_lock to check if reset operation is pending bool is_reset_requested() const { return g_atomic_int_get(const_cast(&_hw_reset_request_count)); } diff --git a/libs/ardour/ardour/port_engine.h b/libs/ardour/ardour/port_engine.h index dc61c3fdad..358211cddf 100644 --- a/libs/ardour/ardour/port_engine.h +++ b/libs/ardour/ardour/port_engine.h @@ -101,12 +101,6 @@ public: */ virtual const std::string& my_name() const = 0; - /** Return true if the underlying mechanism/API is still available - * for us to utilize. return false if some or all of the AudioBackend - * API can no longer be effectively used. - */ - virtual bool available() const = 0; - /** Return the maximum size of a port name */ virtual uint32_t port_name_size() const = 0; diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index ba4dc4348a..510788180e 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1036,16 +1036,6 @@ AudioEngine::is_realtime() const return _backend->is_realtime(); } -bool -AudioEngine::connected() const -{ - if (!_backend) { - return false; - } - - return _backend->available(); -} - void AudioEngine::transport_start () { diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 9594f31d98..ee1c6d6dce 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -1171,12 +1171,6 @@ AlsaAudioBackend::my_name () const return _instance_name; } -bool -AlsaAudioBackend::available () const -{ - return _run && _active; -} - uint32_t AlsaAudioBackend::port_name_size () const { diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h index 11623cfcf4..c74f881fd1 100644 --- a/libs/backends/alsa/alsa_audiobackend.h +++ b/libs/backends/alsa/alsa_audiobackend.h @@ -270,7 +270,6 @@ class AlsaAudioBackend : public AudioBackend { void* private_handle () const; const std::string& my_name () const; - bool available () const; uint32_t port_name_size () const; int set_port_name (PortHandle, const std::string&); diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 4c02c32ec8..642ad2eac6 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -914,12 +914,6 @@ CoreAudioBackend::my_name () const return _instance_name; } -bool -CoreAudioBackend::available () const -{ - return _run && _active_fw && _active_ca; -} - uint32_t CoreAudioBackend::port_name_size () const { diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index 712deca97b..e455d59a93 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -316,7 +316,6 @@ class CoreAudioBackend : public AudioBackend { void* private_handle () const; const std::string& my_name () const; - bool available () const; uint32_t port_name_size () const; int set_port_name (PortHandle, const std::string&); diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index e32eed8852..6caacbea24 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -635,12 +635,6 @@ DummyAudioBackend::my_name () const return _instance_name; } -bool -DummyAudioBackend::available () const -{ - return _running; -} - uint32_t DummyAudioBackend::port_name_size () const { diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h index e687321abf..f8309b1f77 100644 --- a/libs/backends/dummy/dummy_audiobackend.h +++ b/libs/backends/dummy/dummy_audiobackend.h @@ -323,7 +323,6 @@ class DummyAudioBackend : public AudioBackend { void* private_handle () const; const std::string& my_name () const; - bool available () const; uint32_t port_name_size () const; int set_port_name (PortHandle, const std::string&); diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index bd4886651f..fdb72e03ce 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -47,7 +47,6 @@ class JACKAudioBackend : public AudioBackend { std::string name() const; void* private_handle() const; - bool available() const; bool is_realtime () const; bool requires_driver_selection() const; @@ -243,6 +242,8 @@ class JACKAudioBackend : public AudioBackend { void set_jack_callbacks (); int reconnect_to_jack (); + bool available() const; + struct ThreadData { JACKAudioBackend* engine; boost::function f; diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index b7afb4c48d..d5c99f5ee7 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -1196,12 +1196,6 @@ PortAudioBackend::my_name () const return _instance_name; } -bool -PortAudioBackend::available () const -{ - return _run && _active; -} - uint32_t PortAudioBackend::port_name_size () const { diff --git a/libs/backends/portaudio/portaudio_backend.h b/libs/backends/portaudio/portaudio_backend.h index da16d826c4..b6f7fb839b 100644 --- a/libs/backends/portaudio/portaudio_backend.h +++ b/libs/backends/portaudio/portaudio_backend.h @@ -250,7 +250,6 @@ class PortAudioBackend : public AudioBackend { void* private_handle () const; const std::string& my_name () const; - bool available () const; uint32_t port_name_size () const; int set_port_name (PortHandle, const std::string&);