diff options
| author | 2023-08-31 15:09:15 +0100 | |
|---|---|---|
| committer | 2023-09-04 17:12:16 +0100 | |
| commit | ebd19dec99d9809a669f63294745d7c8facc6d31 (patch) | |
| tree | cd1f34cac0c091c2ffd16c429ac33b8fe133e06e /src/audio_core/renderer/voice | |
| parent | Merge pull request #11420 from t895/long-install-fix (diff) | |
| download | yuzu-ebd19dec99d9809a669f63294745d7c8facc6d31.tar.gz yuzu-ebd19dec99d9809a669f63294745d7c8facc6d31.tar.xz yuzu-ebd19dec99d9809a669f63294745d7c8facc6d31.zip | |
Rework ADSP into a wrapper for apps
Diffstat (limited to 'src/audio_core/renderer/voice')
| -rw-r--r-- | src/audio_core/renderer/voice/voice_channel_resource.h | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/voice/voice_context.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/voice/voice_context.h | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/voice/voice_info.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/voice/voice_info.h | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/voice/voice_state.h | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/audio_core/renderer/voice/voice_channel_resource.h b/src/audio_core/renderer/voice/voice_channel_resource.h index 26ab4ccce..4f19c2fcc 100644 --- a/src/audio_core/renderer/voice/voice_channel_resource.h +++ b/src/audio_core/renderer/voice/voice_channel_resource.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include "audio_core/common/common.h" | 8 | #include "audio_core/common/common.h" |
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | 10 | ||
| 11 | namespace AudioCore::AudioRenderer { | 11 | namespace AudioCore::Renderer { |
| 12 | /** | 12 | /** |
| 13 | * Represents one channel for mixing a voice. | 13 | * Represents one channel for mixing a voice. |
| 14 | */ | 14 | */ |
| @@ -35,4 +35,4 @@ public: | |||
| 35 | bool in_use{}; | 35 | bool in_use{}; |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | } // namespace AudioCore::AudioRenderer | 38 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/voice/voice_context.cpp b/src/audio_core/renderer/voice/voice_context.cpp index 16a3e839d..c3644e38b 100644 --- a/src/audio_core/renderer/voice/voice_context.cpp +++ b/src/audio_core/renderer/voice/voice_context.cpp | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include "audio_core/renderer/voice/voice_context.h" | 6 | #include "audio_core/renderer/voice/voice_context.h" |
| 7 | #include "common/polyfill_ranges.h" | 7 | #include "common/polyfill_ranges.h" |
| 8 | 8 | ||
| 9 | namespace AudioCore::AudioRenderer { | 9 | namespace AudioCore::Renderer { |
| 10 | 10 | ||
| 11 | VoiceState& VoiceContext::GetDspSharedState(const u32 index) { | 11 | VoiceState& VoiceContext::GetDspSharedState(const u32 index) { |
| 12 | if (index >= dsp_states.size()) { | 12 | if (index >= dsp_states.size()) { |
| @@ -84,4 +84,4 @@ void VoiceContext::UpdateStateByDspShared() { | |||
| 84 | std::memcpy(cpu_states.data(), dsp_states.data(), voice_count * sizeof(VoiceState)); | 84 | std::memcpy(cpu_states.data(), dsp_states.data(), voice_count * sizeof(VoiceState)); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | } // namespace AudioCore::AudioRenderer | 87 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/voice/voice_context.h b/src/audio_core/renderer/voice/voice_context.h index 43b677154..138ab2773 100644 --- a/src/audio_core/renderer/voice/voice_context.h +++ b/src/audio_core/renderer/voice/voice_context.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include "audio_core/renderer/voice/voice_state.h" | 10 | #include "audio_core/renderer/voice/voice_state.h" |
| 11 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 12 | 12 | ||
| 13 | namespace AudioCore::AudioRenderer { | 13 | namespace AudioCore::Renderer { |
| 14 | /** | 14 | /** |
| 15 | * Contains all voices, with utility functions for managing them. | 15 | * Contains all voices, with utility functions for managing them. |
| 16 | */ | 16 | */ |
| @@ -123,4 +123,4 @@ private: | |||
| 123 | u32 active_count{}; | 123 | u32 active_count{}; |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | } // namespace AudioCore::AudioRenderer | 126 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/voice/voice_info.cpp b/src/audio_core/renderer/voice/voice_info.cpp index c0bfb23fc..6239cfab7 100644 --- a/src/audio_core/renderer/voice/voice_info.cpp +++ b/src/audio_core/renderer/voice/voice_info.cpp | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include "audio_core/renderer/voice/voice_info.h" | 6 | #include "audio_core/renderer/voice/voice_info.h" |
| 7 | #include "audio_core/renderer/voice/voice_state.h" | 7 | #include "audio_core/renderer/voice/voice_state.h" |
| 8 | 8 | ||
| 9 | namespace AudioCore::AudioRenderer { | 9 | namespace AudioCore::Renderer { |
| 10 | 10 | ||
| 11 | VoiceInfo::VoiceInfo() { | 11 | VoiceInfo::VoiceInfo() { |
| 12 | Initialize(); | 12 | Initialize(); |
| @@ -405,4 +405,4 @@ void VoiceInfo::ResetResources(VoiceContext& voice_context) const { | |||
| 405 | } | 405 | } |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | } // namespace AudioCore::AudioRenderer | 408 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/voice/voice_info.h b/src/audio_core/renderer/voice/voice_info.h index 3c5d3e04f..14a687dcb 100644 --- a/src/audio_core/renderer/voice/voice_info.h +++ b/src/audio_core/renderer/voice/voice_info.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include "audio_core/renderer/memory/address_info.h" | 12 | #include "audio_core/renderer/memory/address_info.h" |
| 13 | #include "common/common_types.h" | 13 | #include "common/common_types.h" |
| 14 | 14 | ||
| 15 | namespace AudioCore::AudioRenderer { | 15 | namespace AudioCore::Renderer { |
| 16 | class PoolMapper; | 16 | class PoolMapper; |
| 17 | class VoiceContext; | 17 | class VoiceContext; |
| 18 | struct VoiceState; | 18 | struct VoiceState; |
| @@ -377,4 +377,4 @@ public: | |||
| 377 | u8 flush_buffer_count{}; | 377 | u8 flush_buffer_count{}; |
| 378 | }; | 378 | }; |
| 379 | 379 | ||
| 380 | } // namespace AudioCore::AudioRenderer | 380 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/voice/voice_state.h b/src/audio_core/renderer/voice/voice_state.h index ce947233f..c7aee167b 100644 --- a/src/audio_core/renderer/voice/voice_state.h +++ b/src/audio_core/renderer/voice/voice_state.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | #include "common/fixed_point.h" | 10 | #include "common/fixed_point.h" |
| 11 | 11 | ||
| 12 | namespace AudioCore::AudioRenderer { | 12 | namespace AudioCore::Renderer { |
| 13 | /** | 13 | /** |
| 14 | * Holds a state for a voice. One is kept host-side, and one is used by the AudioRenderer, | 14 | * Holds a state for a voice. One is kept host-side, and one is used by the AudioRenderer, |
| 15 | * host-side is updated on the next iteration. | 15 | * host-side is updated on the next iteration. |
| @@ -67,4 +67,4 @@ struct VoiceState { | |||
| 67 | s32 loop_count; | 67 | s32 loop_count; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | } // namespace AudioCore::AudioRenderer | 70 | } // namespace AudioCore::Renderer |