diff options
| author | 2019-11-24 20:15:51 -0500 | |
|---|---|---|
| committer | 2019-11-24 20:15:51 -0500 | |
| commit | 9046d4a5485452802b756869b7d27056ba9ea9d7 (patch) | |
| tree | 2d704d912e9054fb232b73ad69f1bc3966ed97a5 /src/audio_core | |
| parent | Merge pull request #3098 from ReinUsesLisp/shader-invalidations (diff) | |
| download | yuzu-9046d4a5485452802b756869b7d27056ba9ea9d7.tar.gz yuzu-9046d4a5485452802b756869b7d27056ba9ea9d7.tar.xz yuzu-9046d4a5485452802b756869b7d27056ba9ea9d7.zip | |
kernel: Replace usage of boost::intrusive_ptr with std::shared_ptr for kernel objects. (#3154)
* kernel: Replace usage of boost::intrusive_ptr with std::shared_ptr for kernel objects.
- See https://github.com/citra-emu/citra/pull/4710 for details.
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/audio_renderer.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index e6f38d600..6b0167acd 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp | |||
| @@ -73,7 +73,7 @@ private: | |||
| 73 | EffectInStatus info{}; | 73 | EffectInStatus info{}; |
| 74 | }; | 74 | }; |
| 75 | AudioRenderer::AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendererParameter params, | 75 | AudioRenderer::AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendererParameter params, |
| 76 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event, | 76 | std::shared_ptr<Kernel::WritableEvent> buffer_event, |
| 77 | std::size_t instance_number) | 77 | std::size_t instance_number) |
| 78 | : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count), | 78 | : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count), |
| 79 | effects(params.effect_count) { | 79 | effects(params.effect_count) { |
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h index 4f14b91cd..abed224bb 100644 --- a/src/audio_core/audio_renderer.h +++ b/src/audio_core/audio_renderer.h | |||
| @@ -218,8 +218,7 @@ static_assert(sizeof(UpdateDataHeader) == 0x40, "UpdateDataHeader has wrong size | |||
| 218 | class AudioRenderer { | 218 | class AudioRenderer { |
| 219 | public: | 219 | public: |
| 220 | AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendererParameter params, | 220 | AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendererParameter params, |
| 221 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event, | 221 | std::shared_ptr<Kernel::WritableEvent> buffer_event, std::size_t instance_number); |
| 222 | std::size_t instance_number); | ||
| 223 | ~AudioRenderer(); | 222 | ~AudioRenderer(); |
| 224 | 223 | ||
| 225 | std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); | 224 | std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); |
| @@ -235,7 +234,7 @@ private: | |||
| 235 | class VoiceState; | 234 | class VoiceState; |
| 236 | 235 | ||
| 237 | AudioRendererParameter worker_params; | 236 | AudioRendererParameter worker_params; |
| 238 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event; | 237 | std::shared_ptr<Kernel::WritableEvent> buffer_event; |
| 239 | std::vector<VoiceState> voices; | 238 | std::vector<VoiceState> voices; |
| 240 | std::vector<EffectState> effects; | 239 | std::vector<EffectState> effects; |
| 241 | std::unique_ptr<AudioOut> audio_out; | 240 | std::unique_ptr<AudioOut> audio_out; |