From 001c1b430bddd728ec5add68ec802902f075760a Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 23 Oct 2025 23:45:55 +0300 Subject: [PATCH] minor refactor --- src/audio/AL/ALAudio.cpp | 4 ++-- src/audio/AL/ALAudio.hpp | 2 +- src/audio/NoAudio.hpp | 2 +- src/audio/audio.cpp | 8 +++----- src/audio/audio.hpp | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp index 9e555133..4215f3a1 100644 --- a/src/audio/AL/ALAudio.cpp +++ b/src/audio/AL/ALAudio.cpp @@ -533,11 +533,11 @@ std::vector ALAudio::getOutputDeviceNames() { } std::unique_ptr ALAudio::openInputDevice( - const char* deviceName, uint sampleRate, uint channels, uint bitsPerSample + const std::string& deviceName, uint sampleRate, uint channels, uint bitsPerSample ) { uint bps = bitsPerSample >> 3; ALCdevice* device = alcCaptureOpenDevice( - deviceName, + deviceName.empty() ? nullptr : deviceName.c_str(), sampleRate, AL::to_al_format(channels, bitsPerSample), sampleRate * channels * bps / 8 diff --git a/src/audio/AL/ALAudio.hpp b/src/audio/AL/ALAudio.hpp index d8fe2000..99ca7be1 100644 --- a/src/audio/AL/ALAudio.hpp +++ b/src/audio/AL/ALAudio.hpp @@ -181,7 +181,7 @@ namespace audio { ) override; std::unique_ptr openInputDevice( - const char* deviceName, + const std::string& deviceName, uint sampleRate, uint channels, uint bitsPerSample diff --git a/src/audio/NoAudio.hpp b/src/audio/NoAudio.hpp index a7b4232c..cc0c240d 100644 --- a/src/audio/NoAudio.hpp +++ b/src/audio/NoAudio.hpp @@ -77,7 +77,7 @@ namespace audio { ) override; std::unique_ptr openInputDevice( - const char* deviceName, uint sampleRate, uint channels, uint bitsPerSample + const std::string& deviceName, uint sampleRate, uint channels, uint bitsPerSample ) override { return nullptr; } diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index 06a36c06..313deed8 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -183,7 +183,7 @@ void audio::initialize(bool enabled, AudioSettings& settings) { }, true)); } - input_device = backend->openInputDevice(nullptr, 44100, 1, 16); + input_device = backend->openInputDevice("", 44100, 1, 16); if (input_device) { input_device->startCapture(); } @@ -254,7 +254,7 @@ std::unique_ptr audio::open_stream( } std::unique_ptr audio::open_input_device( - const char* deviceName, uint sampleRate, uint channels, uint bitsPerSample + const std::string& deviceName, uint sampleRate, uint channels, uint bitsPerSample ) { return backend->openInputDevice( deviceName, sampleRate, channels, bitsPerSample @@ -270,9 +270,7 @@ std::vector audio::get_output_devices_names() { } void audio::set_input_device(const std::string& deviceName) { - auto newDevice = backend->openInputDevice( - deviceName.empty() ? nullptr : deviceName.c_str(), 44100, 1, 16 - ); + auto newDevice = backend->openInputDevice(deviceName, 44100, 1, 16); if (newDevice == nullptr) { logger.error() << "could not open input device: " << deviceName; return; diff --git a/src/audio/audio.hpp b/src/audio/audio.hpp index 47fab4f5..8b3a1326 100644 --- a/src/audio/audio.hpp +++ b/src/audio/audio.hpp @@ -362,7 +362,7 @@ namespace audio { std::shared_ptr stream, bool keepSource ) = 0; virtual std::unique_ptr openInputDevice( - const char* deviceName, + const std::string& deviceName, uint sampleRate, uint channels, uint bitsPerSample @@ -437,7 +437,7 @@ namespace audio { /// @param bitsPerSample number of bits per sample (8 or 16) /// @return new InputDevice instance or nullptr std::unique_ptr open_input_device( - const char* deviceName, + const std::string& deviceName, uint sampleRate, uint channels, uint bitsPerSample