diff options
| author | 2023-03-06 19:04:12 -0500 | |
|---|---|---|
| committer | 2023-03-06 20:58:42 -0500 | |
| commit | 1d0fe75e7cca27d79006654dcc56c44cb4096d3a (patch) | |
| tree | 3291e0ad973cd3c0e07ded22c968f40c2c6dd955 /src/audio_core/in | |
| parent | Merge pull request #9890 from Kelebek1/reverb_fix (diff) | |
| download | yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.tar.gz yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.tar.xz yuzu-1d0fe75e7cca27d79006654dcc56c44cb4096d3a.zip | |
hle: rename legacy errors to Results
Diffstat (limited to 'src/audio_core/in')
| -rw-r--r-- | src/audio_core/in/audio_in.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/in/audio_in_system.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_core/in/audio_in.cpp b/src/audio_core/in/audio_in.cpp index 91ccd5ad7..df8c44d1f 100644 --- a/src/audio_core/in/audio_in.cpp +++ b/src/audio_core/in/audio_in.cpp | |||
| @@ -46,7 +46,7 @@ Result In::AppendBuffer(const AudioInBuffer& buffer, 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 | ||
| 52 | void In::ReleaseAndRegisterBuffers() { | 52 | void In::ReleaseAndRegisterBuffers() { |
diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cpp index 934ef8c1c..e23e51758 100644 --- a/src/audio_core/in/audio_in_system.cpp +++ b/src/audio_core/in/audio_in_system.cpp | |||
| @@ -45,11 +45,11 @@ Result System::IsConfigValid(const std::string_view device_name, | |||
| 45 | const AudioInParameter& in_params) const { | 45 | const AudioInParameter& in_params) const { |
| 46 | if ((device_name.size() > 0) && | 46 | if ((device_name.size() > 0) && |
| 47 | (device_name != GetDefaultDeviceName() && device_name != GetDefaultUacDeviceName())) { | 47 | (device_name != GetDefaultDeviceName() && device_name != GetDefaultUacDeviceName())) { |
| 48 | return Service::Audio::ERR_INVALID_DEVICE_NAME; | 48 | return Service::Audio::ResultNotFound; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) { | 51 | if (in_params.sample_rate != TargetSampleRate && in_params.sample_rate > 0) { |
| 52 | return Service::Audio::ERR_INVALID_SAMPLE_RATE; | 52 | return Service::Audio::ResultInvalidSampleRate; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | return ResultSuccess; | 55 | return ResultSuccess; |
| @@ -80,7 +80,7 @@ Result System::Initialize(std::string device_name, const AudioInParameter& in_pa | |||
| 80 | 80 | ||
| 81 | Result System::Start() { | 81 | Result 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, |