diff options
| author | 2018-11-26 18:34:07 -0500 | |
|---|---|---|
| committer | 2018-11-29 08:45:41 -0500 | |
| commit | ff610103b58b3e0dd39fafb539a1cc0bc0fae577 (patch) | |
| tree | cbd54b09f9270f6f1d92a2f45a5ccdb307569093 /src/audio_core | |
| parent | hle_ipc: Use event pair for SleepClientThread (diff) | |
| download | yuzu-ff610103b58b3e0dd39fafb539a1cc0bc0fae577.tar.gz yuzu-ff610103b58b3e0dd39fafb539a1cc0bc0fae577.tar.xz yuzu-ff610103b58b3e0dd39fafb539a1cc0bc0fae577.zip | |
core: Port all current usages of Event to Readable/WritableEvent
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/audio_renderer.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 23e5d3f10..2e59894ab 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include "audio_core/codec.h" | 8 | #include "audio_core/codec.h" |
| 9 | #include "common/assert.h" | 9 | #include "common/assert.h" |
| 10 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 11 | #include "core/hle/kernel/event.h" | 11 | #include "core/hle/kernel/writable_event.h" |
| 12 | #include "core/memory.h" | 12 | #include "core/memory.h" |
| 13 | 13 | ||
| 14 | namespace AudioCore { | 14 | namespace AudioCore { |
| @@ -72,7 +72,7 @@ private: | |||
| 72 | EffectInStatus info{}; | 72 | EffectInStatus info{}; |
| 73 | }; | 73 | }; |
| 74 | AudioRenderer::AudioRenderer(AudioRendererParameter params, | 74 | AudioRenderer::AudioRenderer(AudioRendererParameter params, |
| 75 | Kernel::SharedPtr<Kernel::Event> buffer_event) | 75 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event) |
| 76 | : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count), | 76 | : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count), |
| 77 | effects(params.effect_count) { | 77 | effects(params.effect_count) { |
| 78 | 78 | ||
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h index 71ba4be40..7826881bf 100644 --- a/src/audio_core/audio_renderer.h +++ b/src/audio_core/audio_renderer.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include "core/hle/kernel/object.h" | 15 | #include "core/hle/kernel/object.h" |
| 16 | 16 | ||
| 17 | namespace Kernel { | 17 | namespace Kernel { |
| 18 | class Event; | 18 | class WritableEvent; |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | namespace AudioCore { | 21 | namespace AudioCore { |
| @@ -208,7 +208,8 @@ static_assert(sizeof(UpdateDataHeader) == 0x40, "UpdateDataHeader has wrong size | |||
| 208 | 208 | ||
| 209 | class AudioRenderer { | 209 | class AudioRenderer { |
| 210 | public: | 210 | public: |
| 211 | AudioRenderer(AudioRendererParameter params, Kernel::SharedPtr<Kernel::Event> buffer_event); | 211 | AudioRenderer(AudioRendererParameter params, |
| 212 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event); | ||
| 212 | ~AudioRenderer(); | 213 | ~AudioRenderer(); |
| 213 | 214 | ||
| 214 | std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); | 215 | std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); |
| @@ -224,7 +225,7 @@ private: | |||
| 224 | class VoiceState; | 225 | class VoiceState; |
| 225 | 226 | ||
| 226 | AudioRendererParameter worker_params; | 227 | AudioRendererParameter worker_params; |
| 227 | Kernel::SharedPtr<Kernel::Event> buffer_event; | 228 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event; |
| 228 | std::vector<VoiceState> voices; | 229 | std::vector<VoiceState> voices; |
| 229 | std::vector<EffectState> effects; | 230 | std::vector<EffectState> effects; |
| 230 | std::unique_ptr<AudioOut> audio_out; | 231 | std::unique_ptr<AudioOut> audio_out; |