From 79e99c12a5f22cf01b1191d5ffab350c3f5ed072 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sun, 20 Oct 2024 19:31:08 +0200 Subject: [PATCH] audio_backend: Rename instantiate() parameter arg1 to `client_name` This parameter is consistently used to name the audio backend instance and how it appear as client of the sound server. Just name it `client_name`, consistent with the name of the jack_client_open parameter it is passed to . --- libs/ardour/ardour/audio_backend.h | 4 ++-- libs/ardour/ardour/audioengine.h | 2 +- libs/ardour/audioengine.cc | 4 ++-- libs/backends/alsa/alsa_audiobackend.cc | 6 +++--- libs/backends/coreaudio/coreaudio_backend.cc | 6 +++--- libs/backends/dummy/dummy_audiobackend.cc | 6 +++--- libs/backends/jack/jack_api.cc | 6 +++--- libs/backends/jack/jack_connection.cc | 4 ++-- libs/backends/portaudio/portaudio_backend.cc | 6 +++--- libs/backends/pulseaudio/pulseaudio_backend.cc | 6 +++--- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h index f337e21e92..39f768c131 100644 --- a/libs/ardour/ardour/audio_backend.h +++ b/libs/ardour/ardour/audio_backend.h @@ -44,11 +44,11 @@ namespace ARDOUR struct LIBARDOUR_API AudioBackendInfo { const char* name; - /** Using arg1 and session_id, initialize this audiobackend. + /** Using client_name and session_id, initialize this audiobackend. * * Returns zero on success, non-zero otherwise. */ - int (*instantiate) (const std::string& arg1, const std::string& session_id); + int (*instantiate) (const std::string& client_name, const std::string& session_id); /** Release all resources associated with this audiobackend */ int (*deinstantiate) (void); diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index c047c462a9..698bc96c2b 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -71,7 +71,7 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr int discover_backends(); std::vector available_backends() const; std::string current_backend_name () const; - std::shared_ptr set_backend (const std::string& name, const std::string& arg1, const std::string& session_id); + std::shared_ptr set_backend (const std::string& name, const std::string& client_name, const std::string& session_id); std::shared_ptr current_backend() const { return _backend; } bool setup_required () const; bool is_jack () const; diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 43a9a74bdb..8258bd022b 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1015,7 +1015,7 @@ AudioEngine::drop_backend () } std::shared_ptr -AudioEngine::set_backend (const std::string& name, const std::string& arg1, const std::string& session_id) +AudioEngine::set_backend (const std::string& name, const std::string& client_name, const std::string& session_id) { BackendMap::iterator b = _backends.find (name); @@ -1026,7 +1026,7 @@ AudioEngine::set_backend (const std::string& name, const std::string& arg1, cons drop_backend (); try { - if (b->second->instantiate (arg1, session_id)) { + if (b->second->instantiate (client_name, session_id)) { throw failed_constructor (); } diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index 943ae0b23d..d8cc8b3f93 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -2181,7 +2181,7 @@ AlsaAudioBackend::AudioSlave::update_latencies (uint32_t play, uint32_t capt) static std::shared_ptr _instance; static std::shared_ptr backend_factory (AudioEngine& e); -static int instantiate (const std::string& arg1, const std::string& /* session_id */); +static int instantiate (const std::string& client_name, const std::string& /* session_id */); static int deinstantiate (); static bool already_configured (); static bool available (); @@ -2205,9 +2205,9 @@ backend_factory (AudioEngine& e) } static int -instantiate (const std::string& arg1, const std::string& /* session_id */) +instantiate (const std::string& client_name, const std::string& /* session_id */) { - s_instance_name = arg1; + s_instance_name = client_name; return 0; } diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 967660a6f8..090220237c 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -1529,7 +1529,7 @@ CoreAudioBackend::hw_changed_callback () static std::shared_ptr _instance; static std::shared_ptr backend_factory (AudioEngine& e); -static int instantiate (const std::string& arg1, const std::string& /* session_id */); +static int instantiate (const std::string& client_name, const std::string& /* session_id */); static int deinstantiate (); static bool already_configured (); static bool available (); @@ -1553,9 +1553,9 @@ backend_factory (AudioEngine& e) } static int -instantiate (const std::string& arg1, const std::string& /* session_id */) +instantiate (const std::string& client_name, const std::string& /* session_id */) { - s_instance_name = arg1; + s_instance_name = client_name; return 0; } diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index b153189b28..b7016694f3 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -1016,7 +1016,7 @@ DummyAudioBackend::main_process_thread () static std::shared_ptr _instance; static std::shared_ptr backend_factory (AudioEngine& e); -static int instantiate (const std::string& arg1, const std::string& /* session_id */); +static int instantiate (const std::string& client_name, const std::string& /* session_id */); static int deinstantiate (); static bool already_configured (); static bool available (); @@ -1040,9 +1040,9 @@ backend_factory (AudioEngine& e) } static int -instantiate (const std::string& arg1, const std::string& /* session_id */) +instantiate (const std::string& client_name, const std::string& /* session_id */) { - s_instance_name = arg1; + s_instance_name = client_name; return 0; } diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc index 5e437a4641..f3123926c6 100644 --- a/libs/backends/jack/jack_api.cc +++ b/libs/backends/jack/jack_api.cc @@ -25,7 +25,7 @@ static std::shared_ptr backend; static std::shared_ptr jack_connection; static std::shared_ptr backend_factory (AudioEngine& ae); -static int instantiate (const std::string& arg1, const std::string& session_id); +static int instantiate (const std::string& client_name, const std::string& session_id); static int deinstantiate (); static bool already_configured (); static bool available (); @@ -58,10 +58,10 @@ backend_factory (AudioEngine& ae) } static int -instantiate (const std::string& arg1, const std::string& session_id) +instantiate (const std::string& client_name, const std::string& session_id) { try { - jack_connection.reset (new JackConnection (arg1, session_id)); + jack_connection.reset (new JackConnection (client_name, session_id)); backend.reset (); } catch (...) { return -1; diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc index ac1ee247a0..540bbd6248 100644 --- a/libs/backends/jack/jack_connection.cc +++ b/libs/backends/jack/jack_connection.cc @@ -50,9 +50,9 @@ static void jack_halted_info_callback (jack_status_t code, const char* reason, v } -JackConnection::JackConnection (const std::string& arg1, const std::string& session_id) +JackConnection::JackConnection (const std::string& client_name, const std::string& session_id) : _jack (0) - , _client_name (arg1) + , _client_name (client_name) , _session_id (session_id) , _probed_buffer_size (0) , _probed_sample_rate (0) diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index 71b88e84bf..0bf16c8949 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -1793,7 +1793,7 @@ PortAudioBackend::process_port_connection_changes () static std::shared_ptr _instance; static std::shared_ptr backend_factory (AudioEngine& e); -static int instantiate (const std::string& arg1, const std::string& /* session_id */); +static int instantiate (const std::string& client_name, const std::string& /* session_id */); static int deinstantiate (); static bool already_configured (); static bool available (); @@ -1817,9 +1817,9 @@ backend_factory (AudioEngine& e) } static int -instantiate (const std::string& arg1, const std::string& /* session_id */) +instantiate (const std::string& client_name, const std::string& /* session_id */) { - s_instance_name = arg1; + s_instance_name = client_name; return 0; } diff --git a/libs/backends/pulseaudio/pulseaudio_backend.cc b/libs/backends/pulseaudio/pulseaudio_backend.cc index de29b1a30f..39b9d9759f 100644 --- a/libs/backends/pulseaudio/pulseaudio_backend.cc +++ b/libs/backends/pulseaudio/pulseaudio_backend.cc @@ -1084,7 +1084,7 @@ PulseAudioBackend::main_process_thread () static std::shared_ptr _instance; static std::shared_ptr backend_factory (AudioEngine& e); -static int instantiate (const std::string& arg1, const std::string& /* session_id */); +static int instantiate (const std::string& client_name, const std::string& /* session_id */); static int deinstantiate (); static bool already_configured (); static bool available (); @@ -1108,9 +1108,9 @@ backend_factory (AudioEngine& e) } static int -instantiate (const std::string& arg1, const std::string& /* session_id */) +instantiate (const std::string& client_name, const std::string& /* session_id */) { - s_instance_name = arg1; + s_instance_name = client_name; return 0; }