summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/audio
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-05-21 07:05:04 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-06-02 06:39:27 +0200
commit12c1766997f2596b4b1b1a6a411e4f6d56605ee7 (patch)
treee718a0f18be8aaf664ebdcd197af513e5a118b72 /src/core/hle/service/audio
parentMerge pull request #6395 from lioncash/result-move (diff)
downloadyuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.gz
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.bz2
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.lz
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.xz
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.zst
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.zip
Diffstat (limited to 'src/core/hle/service/audio')
-rw-r--r--src/core/hle/service/audio/audctl.cpp4
-rw-r--r--src/core/hle/service/audio/audin_u.cpp6
-rw-r--r--src/core/hle/service/audio/audout_u.cpp26
-rw-r--r--src/core/hle/service/audio/audren_u.cpp42
-rw-r--r--src/core/hle/service/audio/hwopus.cpp6
5 files changed, 42 insertions, 42 deletions
diff --git a/src/core/hle/service/audio/audctl.cpp b/src/core/hle/service/audio/audctl.cpp
index 84890be72..8c4c49b85 100644
--- a/src/core/hle/service/audio/audctl.cpp
+++ b/src/core/hle/service/audio/audctl.cpp
@@ -57,7 +57,7 @@ void AudCtl::GetTargetVolumeMin(Kernel::HLERequestContext& ctx) {
constexpr s32 target_min_volume = 0;
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(target_min_volume);
}
@@ -69,7 +69,7 @@ void AudCtl::GetTargetVolumeMax(Kernel::HLERequestContext& ctx) {
constexpr s32 target_max_volume = 15;
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(target_max_volume);
}
diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp
index ecd05e4a6..3e7fd6024 100644
--- a/src/core/hle/service/audio/audin_u.cpp
+++ b/src/core/hle/service/audio/audin_u.cpp
@@ -70,7 +70,7 @@ void AudInU::ListAudioIns(Kernel::HLERequestContext& ctx) {
ctx.WriteBuffer(device_names);
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(static_cast<u32>(device_names.size()));
}
@@ -82,7 +82,7 @@ void AudInU::ListAudioInsAutoFiltered(Kernel::HLERequestContext& ctx) {
// device listing just omits the default input device
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(static_cast<u32>(device_count));
}
@@ -94,7 +94,7 @@ void AudInU::OpenInOutImpl(Kernel::HLERequestContext& ctx) {
params.state = State::Started;
IPC::ResponseBuilder rb{ctx, 6, 0, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushRaw<AudInOutParams>(params);
rb.PushIpcInterface<IAudioIn>(system);
}
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index e1ae726f5..804c6b10c 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -91,7 +91,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(static_cast<u32>(stream->IsPlaying() ? AudioState::Started : AudioState::Stopped));
}
@@ -107,7 +107,7 @@ private:
audio_core.StartStream(stream);
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void StopAudioOut(Kernel::HLERequestContext& ctx) {
@@ -118,14 +118,14 @@ private:
}
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void RegisterBufferEvent(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent());
}
@@ -150,7 +150,7 @@ private:
}
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void GetReleasedAudioOutBufferImpl(Kernel::HLERequestContext& ctx) {
@@ -164,7 +164,7 @@ private:
ctx.WriteBuffer(tags);
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(static_cast<u32>(released_buffers.size()));
}
@@ -174,7 +174,7 @@ private:
IPC::RequestParser rp{ctx};
const u64 tag{rp.Pop<u64>()};
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(stream->ContainsBuffer(tag));
}
@@ -182,7 +182,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(static_cast<u32>(stream->GetQueueSize()));
}
@@ -190,7 +190,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(stream->Flush());
}
@@ -202,14 +202,14 @@ private:
stream->SetVolume(volume);
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void GetAudioOutVolume(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(stream->GetVolume());
}
@@ -246,7 +246,7 @@ void AudOutU::ListAudioOutsImpl(Kernel::HLERequestContext& ctx) {
ctx.WriteBuffer(DefaultDevice);
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(1); // Amount of audio devices
}
@@ -279,7 +279,7 @@ void AudOutU::OpenAudioOutImpl(Kernel::HLERequestContext& ctx) {
system, params, *audio_core, std::move(device_name), std::move(unique_name));
IPC::ResponseBuilder rb{ctx, 6, 0, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(DefaultSampleRate);
rb.Push<u32>(params.channel_count);
rb.Push<u32>(static_cast<u32>(AudioCore::Codec::PcmFormat::Int16));
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index ae4284adf..800feba6e 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -65,7 +65,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(renderer->GetSampleRate());
}
@@ -73,7 +73,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(renderer->GetSampleCount());
}
@@ -81,7 +81,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(static_cast<u32>(renderer->GetStreamState()));
}
@@ -89,7 +89,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(renderer->GetMixBufferCount());
}
@@ -112,7 +112,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void Stop(Kernel::HLERequestContext& ctx) {
@@ -120,14 +120,14 @@ private:
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void QuerySystemEvent(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushCopyObjects(system_event.GetReadableEvent());
}
@@ -140,14 +140,14 @@ private:
ASSERT(rendering_time_limit_percent <= 100);
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void GetRenderingTimeLimit(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(rendering_time_limit_percent);
}
@@ -230,7 +230,7 @@ private:
ctx.WriteBuffer(name_buffer);
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(static_cast<u32>(name_buffer.size()));
}
@@ -244,7 +244,7 @@ private:
LOG_WARNING(Service_Audio, "(STUBBED) called. name={}, volume={}", name, volume);
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void GetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) {
@@ -254,7 +254,7 @@ private:
LOG_WARNING(Service_Audio, "(STUBBED) called. name={}", name);
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push(1.0f);
}
@@ -270,7 +270,7 @@ private:
ctx.WriteBuffer(out_device_name);
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
}
void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {
@@ -279,7 +279,7 @@ private:
buffer_event.GetWritableEvent().Signal();
IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent());
}
@@ -287,7 +287,7 @@ private:
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(1);
}
@@ -296,7 +296,7 @@ private:
LOG_WARNING(Service_Audio, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent());
}
@@ -304,7 +304,7 @@ private:
LOG_DEBUG(Service_Audio, "called");
IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushCopyObjects(buffer_event.GetReadableEvent());
}
@@ -636,7 +636,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
size = Common::AlignUp(size, 4096);
IPC::ResponseBuilder rb{ctx, 4};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u64>(size);
LOG_DEBUG(Service_Audio, "buffer_size=0x{:X}", size);
@@ -651,7 +651,7 @@ void AudRenU::GetAudioDeviceService(Kernel::HLERequestContext& ctx) {
// Revisionless variant of GetAudioDeviceServiceWithRevisionInfo that
// always assumes the initial release revision (REV1).
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushIpcInterface<IAudioDevice>(system, buffer_event, Common::MakeMagic('R', 'E', 'V', '1'));
}
@@ -673,7 +673,7 @@ void AudRenU::GetAudioDeviceServiceWithRevisionInfo(Kernel::HLERequestContext& c
LOG_DEBUG(Service_Audio, "called. revision={:08X}, aruid={:016X}", revision, aruid);
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushIpcInterface<IAudioDevice>(system, buffer_event, revision);
}
@@ -682,7 +682,7 @@ void AudRenU::OpenAudioRendererImpl(Kernel::HLERequestContext& ctx) {
const auto params = rp.PopRaw<AudioCommon::AudioRendererParameter>();
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushIpcInterface<IAudioRenderer>(system, params, audren_instance_count++);
}
diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp
index ee5ec8cd6..4e534edac 100644
--- a/src/core/hle/service/audio/hwopus.cpp
+++ b/src/core/hle/service/audio/hwopus.cpp
@@ -86,7 +86,7 @@ private:
const u32 param_size = performance != nullptr ? 6 : 4;
IPC::ResponseBuilder rb{ctx, param_size};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(consumed);
rb.Push<u32>(sample_count);
if (performance) {
@@ -249,7 +249,7 @@ void HwOpus::GetWorkBufferSize(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Audio, "worker_buffer_sz={}", worker_buffer_sz);
IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.Push<u32>(worker_buffer_sz);
}
@@ -286,7 +286,7 @@ void HwOpus::OpenOpusDecoder(Kernel::HLERequestContext& ctx) {
}
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(RESULT_SUCCESS);
+ rb.Push(ResultSuccess);
rb.PushIpcInterface<IHardwareOpusDecoderManager>(
system, OpusDecoderState{std::move(decoder), sample_rate, channel_count});
}