summaryrefslogtreecommitdiff
path: root/src/audio_core/out
diff options
context:
space:
mode:
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) {
46 if (system.AppendBuffer(buffer, tag)) { 46 if (system.AppendBuffer(buffer, tag)) {
47 return ResultSuccess; 47 return ResultSuccess;
48 } 48 }
49 return Service::Audio::ERR_BUFFER_COUNT_EXCEEDED; 49 return Service::Audio::ResultBufferCountReached;
50} 50}
51 51
52void Out::ReleaseAndRegisterBuffers() { 52void 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 {
33Result System::IsConfigValid(std::string_view device_name, 33Result System::IsConfigValid(std::string_view device_name,
34 const AudioOutParameter& in_params) const { 34 const AudioOutParameter& in_params) const {
35 if ((device_name.size() > 0) && (device_name != GetDefaultOutputDeviceName())) { 35 if ((device_name.size() > 0) && (device_name != GetDefaultOutputDeviceName())) {
36 return Service::Audio::ERR_INVALID_DEVICE_NAME; 36 return Service::Audio::ResultNotFound;
37 } 37 }
38 38
39 if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) { 39 if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) {
40 return Service::Audio::ERR_INVALID_SAMPLE_RATE; 40 return Service::Audio::ResultInvalidSampleRate;
41 } 41 }
42 42
43 if (in_params.channel_count == 0 || in_params.channel_count == 2 || 43 if (in_params.channel_count == 0 || in_params.channel_count == 2 ||
@@ -45,7 +45,7 @@ Result System::IsConfigValid(std::string_view device_name,
45 return ResultSuccess; 45 return ResultSuccess;
46 } 46 }
47 47
48 return Service::Audio::ERR_INVALID_CHANNEL_COUNT; 48 return Service::Audio::ResultInvalidChannelCount;
49} 49}
50 50
51Result System::Initialize(std::string device_name, const AudioOutParameter& in_params, u32 handle_, 51Result System::Initialize(std::string device_name, const AudioOutParameter& in_params, u32 handle_,
@@ -80,7 +80,7 @@ size_t System::GetSessionId() const {
80 80
81Result System::Start() { 81Result System::Start() {
82 if (state != State::Stopped) { 82 if (state != State::Stopped) {
83 return Service::Audio::ERR_OPERATION_FAILED; 83 return Service::Audio::ResultOperationFailed;
84 } 84 }
85 85
86 session->Initialize(name, sample_format, channel_count, session_id, handle, 86 session->Initialize(name, sample_format, channel_count, session_id, handle,