VERY experimental Nintendo Switch 2 emulator
C++
audio_device: Mark member functions as const where applicable
Lioncash1747b5ae6c49
diff --git a/src/audio_core/renderer/audio_device.cpp b/src/audio_core/renderer/audio_device.cppindex a4696065e7..0d9d8f6ce5 100644--- a/src/audio_core/renderer/audio_device.cpp+++ b/src/audio_core/renderer/audio_device.cpp@@ -37,7 +37,7 @@ AudioDevice::AudioDevice(Core::System& system, const u64 applet_resource_user_idapplet_resource_user_id{applet_resource_user_id_}, user_revision{revision} {}u32 AudioDevice::ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer,- const size_t max_count) {+ const size_t max_count) const {std::span<const AudioDeviceName> names{};if (CheckFeatureSupported(SupportTags::AudioUsbDeviceOutput, user_revision)) {@@ -46,7 +46,7 @@ u32 AudioDevice::ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer,names = device_names;}- u32 out_count{static_cast<u32>(std::min(max_count, names.size()))};+ const u32 out_count{static_cast<u32>(std::min(max_count, names.size()))};for (u32 i = 0; i < out_count; i++) {out_buffer.push_back(names[i]);}@@ -54,8 +54,8 @@ u32 AudioDevice::ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer,}u32 AudioDevice::ListAudioOutputDeviceName(std::vector<AudioDeviceName>& out_buffer,- const size_t max_count) {- u32 out_count{static_cast<u32>(std::min(max_count, output_device_names.size()))};+ const size_t max_count) const {+ const u32 out_count{static_cast<u32>(std::min(max_count, output_device_names.size()))};for (u32 i = 0; i < out_count; i++) {out_buffer.push_back(output_device_names[i]);@@ -67,7 +67,7 @@ void AudioDevice::SetDeviceVolumes(const f32 volume) {output_sink.SetDeviceVolume(volume);}-f32 AudioDevice::GetDeviceVolume([[maybe_unused]] std::string_view name) {+f32 AudioDevice::GetDeviceVolume([[maybe_unused]] std::string_view name) const {return output_sink.GetDeviceVolume();}diff --git a/src/audio_core/renderer/audio_device.h b/src/audio_core/renderer/audio_device.hindex ba1f4c7484..dd6be70eeb 100644--- a/src/audio_core/renderer/audio_device.h+++ b/src/audio_core/renderer/audio_device.h@@ -39,7 +39,7 @@ public:* @param max_count - Maximum number of devices to write (count of out_buffer).* @return Number of device names written.*/- u32 ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer, size_t max_count);+ u32 ListAudioDeviceName(std::vector<AudioDeviceName>& out_buffer, size_t max_count) const;/*** Get a list of the available output devices.@@ -49,7 +49,7 @@ public:* @param max_count - Maximum number of devices to write (count of out_buffer).* @return Number of device names written.*/- u32 ListAudioOutputDeviceName(std::vector<AudioDeviceName>& out_buffer, size_t max_count);+ u32 ListAudioOutputDeviceName(std::vector<AudioDeviceName>& out_buffer, size_t max_count) const;/*** Set the volume of all streams in the backend sink.@@ -65,7 +65,7 @@ public:* @param name - Name of the device to check. Unused.* @return Volume of the device.*/- f32 GetDeviceVolume(std::string_view name);+ f32 GetDeviceVolume(std::string_view name) const;private:/// Backend output sink for the devicediff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cppindex bc69117c62..6fb07c37dc 100644--- a/src/core/hle/service/audio/audren_u.cpp+++ b/src/core/hle/service/audio/audren_u.cpp@@ -252,7 +252,7 @@ private:std::vector<AudioDevice::AudioDeviceName> out_names{};- u32 out_count = impl->ListAudioDeviceName(out_names, in_count);+ const u32 out_count = impl->ListAudioDeviceName(out_names, in_count);std::string out{};for (u32 i = 0; i < out_count; i++) {@@ -365,7 +365,7 @@ private:std::vector<AudioDevice::AudioDeviceName> out_names{};- u32 out_count = impl->ListAudioOutputDeviceName(out_names, in_count);+ const u32 out_count = impl->ListAudioOutputDeviceName(out_names, in_count);std::string out{};for (u32 i = 0; i < out_count; i++) {