diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-03 21:30:01 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-08-05 00:22:58 +0200 |
| commit | f1cb3903ac358183dcdc562ba19dc469b056e73f (patch) | |
| tree | 0179ee55d3c573cdd9189cb708e2b69e02a1b166 /src/core/hle/service/audio | |
| parent | cubeb_sink: Support variable sample_rate and num_channels. (diff) | |
| download | yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.tar yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.tar.gz yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.tar.bz2 yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.tar.lz yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.tar.xz yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.tar.zst yuzu-f1cb3903ac358183dcdc562ba19dc469b056e73f.zip | |
Diffstat (limited to 'src/core/hle/service/audio')
| -rw-r--r-- | src/core/hle/service/audio/audout_u.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audout_u.h | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index 9f4c7855a..f4a557634 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -4,6 +4,8 @@ #include <array> #include <vector> + +#include "audio_core/codec.h" #include "common/logging/log.h" #include "core/core.h" #include "core/hle/ipc_helpers.h" @@ -200,7 +202,7 @@ void AudOutU::OpenAudioOutImpl(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push<u32>(DefaultSampleRate); rb.Push<u32>(params.channel_count); - rb.Push<u32>(static_cast<u32>(PcmFormat::Int16)); + rb.Push<u32>(static_cast<u32>(AudioCore::Codec::PcmFormat::Int16)); rb.Push<u32>(static_cast<u32>(AudioState::Stopped)); rb.PushIpcInterface<Audio::IAudioOut>(audio_out_interface); } diff --git a/src/core/hle/service/audio/audout_u.h b/src/core/hle/service/audio/audout_u.h index e5c2184d5..fd491f65d 100644 --- a/src/core/hle/service/audio/audout_u.h +++ b/src/core/hle/service/audio/audout_u.h @@ -38,16 +38,6 @@ private: void ListAudioOutsImpl(Kernel::HLERequestContext& ctx); void OpenAudioOutImpl(Kernel::HLERequestContext& ctx); - - enum class PcmFormat : u32 { - Invalid = 0, - Int8 = 1, - Int16 = 2, - Int24 = 3, - Int32 = 4, - PcmFloat = 5, - Adpcm = 6, - }; }; } // namespace Service::Audio |