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/mix | |
| 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/mix')
| -rw-r--r-- | src/audio_core/renderer/mix/mix_context.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/mix/mix_context.h | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/mix/mix_info.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/renderer/mix/mix_info.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/audio_core/renderer/mix/mix_context.cpp b/src/audio_core/renderer/mix/mix_context.cpp index 3a18ae7c2..c712610bb 100644 --- a/src/audio_core/renderer/mix/mix_context.cpp +++ b/src/audio_core/renderer/mix/mix_context.cpp | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include "audio_core/renderer/splitter/splitter_context.h" | 7 | #include "audio_core/renderer/splitter/splitter_context.h" |
| 8 | #include "common/polyfill_ranges.h" | 8 | #include "common/polyfill_ranges.h" |
| 9 | 9 | ||
| 10 | namespace AudioCore::AudioRenderer { | 10 | namespace AudioCore::Renderer { |
| 11 | 11 | ||
| 12 | void MixContext::Initialize(std::span<MixInfo*> sorted_mix_infos_, std::span<MixInfo> mix_infos_, | 12 | void MixContext::Initialize(std::span<MixInfo*> sorted_mix_infos_, std::span<MixInfo> mix_infos_, |
| 13 | const u32 count_, std::span<s32> effect_process_order_buffer_, | 13 | const u32 count_, std::span<s32> effect_process_order_buffer_, |
| @@ -139,4 +139,4 @@ EdgeMatrix& MixContext::GetEdgeMatrix() { | |||
| 139 | return edge_matrix; | 139 | return edge_matrix; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | } // namespace AudioCore::AudioRenderer | 142 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/mix/mix_context.h b/src/audio_core/renderer/mix/mix_context.h index bcd9637da..ce19ec8d6 100644 --- a/src/audio_core/renderer/mix/mix_context.h +++ b/src/audio_core/renderer/mix/mix_context.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include "audio_core/renderer/nodes/node_states.h" | 10 | #include "audio_core/renderer/nodes/node_states.h" |
| 11 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 12 | 12 | ||
| 13 | namespace AudioCore::AudioRenderer { | 13 | namespace AudioCore::Renderer { |
| 14 | class SplitterContext; | 14 | class SplitterContext; |
| 15 | 15 | ||
| 16 | /* | 16 | /* |
| @@ -121,4 +121,4 @@ private: | |||
| 121 | EdgeMatrix edge_matrix{}; | 121 | EdgeMatrix edge_matrix{}; |
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | } // namespace AudioCore::AudioRenderer | 124 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/mix/mix_info.cpp b/src/audio_core/renderer/mix/mix_info.cpp index cc18e57ee..5e44bde18 100644 --- a/src/audio_core/renderer/mix/mix_info.cpp +++ b/src/audio_core/renderer/mix/mix_info.cpp | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include "audio_core/renderer/nodes/edge_matrix.h" | 7 | #include "audio_core/renderer/nodes/edge_matrix.h" |
| 8 | #include "audio_core/renderer/splitter/splitter_context.h" | 8 | #include "audio_core/renderer/splitter/splitter_context.h" |
| 9 | 9 | ||
| 10 | namespace AudioCore::AudioRenderer { | 10 | namespace AudioCore::Renderer { |
| 11 | 11 | ||
| 12 | MixInfo::MixInfo(std::span<s32> effect_order_buffer_, s32 effect_count_, BehaviorInfo& behavior) | 12 | MixInfo::MixInfo(std::span<s32> effect_order_buffer_, s32 effect_count_, BehaviorInfo& behavior) |
| 13 | : effect_order_buffer{effect_order_buffer_}, effect_count{effect_count_}, | 13 | : effect_order_buffer{effect_order_buffer_}, effect_count{effect_count_}, |
| @@ -117,4 +117,4 @@ bool MixInfo::HasAnyConnection() const { | |||
| 117 | return dst_mix_id != UnusedMixId || dst_splitter_id != UnusedSplitterId; | 117 | return dst_mix_id != UnusedMixId || dst_splitter_id != UnusedSplitterId; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | } // namespace AudioCore::AudioRenderer | 120 | } // namespace AudioCore::Renderer |
diff --git a/src/audio_core/renderer/mix/mix_info.h b/src/audio_core/renderer/mix/mix_info.h index b5fa4c0c7..7005daa4f 100644 --- a/src/audio_core/renderer/mix/mix_info.h +++ b/src/audio_core/renderer/mix/mix_info.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include "audio_core/common/common.h" | 9 | #include "audio_core/common/common.h" |
| 10 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 11 | 11 | ||
| 12 | namespace AudioCore::AudioRenderer { | 12 | namespace AudioCore::Renderer { |
| 13 | class EdgeMatrix; | 13 | class EdgeMatrix; |
| 14 | class SplitterContext; | 14 | class SplitterContext; |
| 15 | class EffectContext; | 15 | class EffectContext; |
| @@ -121,4 +121,4 @@ public: | |||
| 121 | const bool long_size_pre_delay_supported; | 121 | const bool long_size_pre_delay_supported; |
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | } // namespace AudioCore::AudioRenderer | 124 | } // namespace AudioCore::Renderer |