summaryrefslogtreecommitdiffstats
path: root/src/audio_core/out
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-08 15:16:27 +0100
committerGitHub <noreply@github.com>2023-03-08 15:16:27 +0100
commitf3f57f90fed6d1c3b478c9fceb91a54579b4947d (patch)
tree3280b90f3b54b6f8f3fca804cab04699897faa3f /src/audio_core/out
parentMerge pull request #9904 from liamwhite/ws (diff)
parenthle: rename legacy errors to Results (diff)
downloadyuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar
yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.gz
yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.bz2
yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.lz
yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.xz
yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.zst
yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.zip
Diffstat (limited to 'src/audio_core/out')
-rw-r--r--src/audio_core/out/audio_out.cpp2
-rw-r--r--src/audio_core/out/audio_out_system.cpp8
2 files changed, 5 insertions, 5 deletions
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,