From 1d0fe75e7cca27d79006654dcc56c44cb4096d3a Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 6 Mar 2023 19:04:12 -0500 Subject: hle: rename legacy errors to Results --- src/audio_core/out/audio_out.cpp | 2 +- src/audio_core/out/audio_out_system.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/audio_core/out') diff --git a/src/audio_core/out/audio_out.cpp b/src/audio_core/out/audio_out.cpp index d3ee4f0eb..b7ea13405 100644 --- a/src/audio_core/out/audio_out.cpp +++ b/src/audio_core/out/audio_out.cpp @@ -46,7 +46,7 @@ Result Out::AppendBuffer(const AudioOutBuffer& buffer, const u64 tag) { if (system.AppendBuffer(buffer, tag)) { return ResultSuccess; } - return Service::Audio::ERR_BUFFER_COUNT_EXCEEDED; + return Service::Audio::ResultBufferCountReached; } void Out::ReleaseAndRegisterBuffers() { diff --git a/src/audio_core/out/audio_out_system.cpp b/src/audio_core/out/audio_out_system.cpp index e096a1dac..bd13f7219 100644 --- a/src/audio_core/out/audio_out_system.cpp +++ b/src/audio_core/out/audio_out_system.cpp @@ -33,11 +33,11 @@ std::string_view System::GetDefaultOutputDeviceName() const { Result System::IsConfigValid(std::string_view device_name, const AudioOutParameter& in_params) const { if ((device_name.size() > 0) && (device_name != GetDefaultOutputDeviceName())) { - return Service::Audio::ERR_INVALID_DEVICE_NAME; + return Service::Audio::ResultNotFound; } if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) { - return Service::Audio::ERR_INVALID_SAMPLE_RATE; + return Service::Audio::ResultInvalidSampleRate; } if (in_params.channel_count == 0 || in_params.channel_count == 2 || @@ -45,7 +45,7 @@ Result System::IsConfigValid(std::string_view device_name, return ResultSuccess; } - return Service::Audio::ERR_INVALID_CHANNEL_COUNT; + return Service::Audio::ResultInvalidChannelCount; } Result System::Initialize(std::string device_name, const AudioOutParameter& in_params, u32 handle_, @@ -80,7 +80,7 @@ size_t System::GetSessionId() const { Result System::Start() { if (state != State::Stopped) { - return Service::Audio::ERR_OPERATION_FAILED; + return Service::Audio::ResultOperationFailed; } session->Initialize(name, sample_format, channel_count, session_id, handle, -- cgit v1.2.3