diff options
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/adsp/adsp.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/renderer/command/command_generator.cpp | 12 | ||||
| -rw-r--r-- | src/audio_core/renderer/mix/mix_info.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/renderer/splitter/splitter_context.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/renderer/splitter/splitter_context.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/audio_core/adsp/adsp.cpp b/src/audio_core/adsp/adsp.cpp index 6c53c98fd..48f0a63d4 100644 --- a/src/audio_core/adsp/adsp.cpp +++ b/src/audio_core/adsp/adsp.cpp | |||
| @@ -11,7 +11,7 @@ ADSP::ADSP(Core::System& system, Sink::Sink& sink) { | |||
| 11 | opus_decoder = std::make_unique<OpusDecoder::OpusDecoder>(system); | 11 | opus_decoder = std::make_unique<OpusDecoder::OpusDecoder>(system); |
| 12 | opus_decoder->Send(Direction::DSP, OpusDecoder::Message::Start); | 12 | opus_decoder->Send(Direction::DSP, OpusDecoder::Message::Start); |
| 13 | if (opus_decoder->Receive(Direction::Host) != OpusDecoder::Message::StartOK) { | 13 | if (opus_decoder->Receive(Direction::Host) != OpusDecoder::Message::StartOK) { |
| 14 | LOG_ERROR(Service_Audio, "OpusDeocder failed to initialize."); | 14 | LOG_ERROR(Service_Audio, "OpusDecoder failed to initialize."); |
| 15 | return; | 15 | return; |
| 16 | } | 16 | } |
| 17 | } | 17 | } |
diff --git a/src/audio_core/renderer/command/command_generator.cpp b/src/audio_core/renderer/command/command_generator.cpp index ccb186209..f97db5899 100644 --- a/src/audio_core/renderer/command/command_generator.cpp +++ b/src/audio_core/renderer/command/command_generator.cpp | |||
| @@ -41,7 +41,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info, | |||
| 41 | const VoiceState& voice_state, const s8 channel) { | 41 | const VoiceState& voice_state, const s8 channel) { |
| 42 | if (voice_info.mix_id == UnusedMixId) { | 42 | if (voice_info.mix_id == UnusedMixId) { |
| 43 | if (voice_info.splitter_id != UnusedSplitterId) { | 43 | if (voice_info.splitter_id != UnusedSplitterId) { |
| 44 | auto destination{splitter_context.GetDesintationData(voice_info.splitter_id, 0)}; | 44 | auto destination{splitter_context.GetDestinationData(voice_info.splitter_id, 0)}; |
| 45 | u32 dest_id{0}; | 45 | u32 dest_id{0}; |
| 46 | while (destination != nullptr) { | 46 | while (destination != nullptr) { |
| 47 | if (destination->IsConfigured()) { | 47 | if (destination->IsConfigured()) { |
| @@ -55,7 +55,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info, | |||
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | dest_id++; | 57 | dest_id++; |
| 58 | destination = splitter_context.GetDesintationData(voice_info.splitter_id, dest_id); | 58 | destination = splitter_context.GetDestinationData(voice_info.splitter_id, dest_id); |
| 59 | } | 59 | } |
| 60 | } | 60 | } |
| 61 | } else { | 61 | } else { |
| @@ -234,7 +234,7 @@ void CommandGenerator::GenerateVoiceCommand(VoiceInfo& voice_info) { | |||
| 234 | if (voice_info.mix_id == UnusedMixId) { | 234 | if (voice_info.mix_id == UnusedMixId) { |
| 235 | if (voice_info.splitter_id != UnusedSplitterId) { | 235 | if (voice_info.splitter_id != UnusedSplitterId) { |
| 236 | auto i{channel}; | 236 | auto i{channel}; |
| 237 | auto destination{splitter_context.GetDesintationData(voice_info.splitter_id, i)}; | 237 | auto destination{splitter_context.GetDestinationData(voice_info.splitter_id, i)}; |
| 238 | while (destination != nullptr) { | 238 | while (destination != nullptr) { |
| 239 | if (destination->IsConfigured()) { | 239 | if (destination->IsConfigured()) { |
| 240 | const auto mix_id{destination->GetMixId()}; | 240 | const auto mix_id{destination->GetMixId()}; |
| @@ -249,7 +249,7 @@ void CommandGenerator::GenerateVoiceCommand(VoiceInfo& voice_info) { | |||
| 249 | } | 249 | } |
| 250 | } | 250 | } |
| 251 | i += voice_info.channel_count; | 251 | i += voice_info.channel_count; |
| 252 | destination = splitter_context.GetDesintationData(voice_info.splitter_id, i); | 252 | destination = splitter_context.GetDestinationData(voice_info.splitter_id, i); |
| 253 | } | 253 | } |
| 254 | } | 254 | } |
| 255 | } else { | 255 | } else { |
| @@ -591,7 +591,7 @@ void CommandGenerator::GenerateMixCommands(MixInfo& mix_info) { | |||
| 591 | if (mix_info.dst_splitter_id != UnusedSplitterId) { | 591 | if (mix_info.dst_splitter_id != UnusedSplitterId) { |
| 592 | s16 dest_id{0}; | 592 | s16 dest_id{0}; |
| 593 | auto destination{ | 593 | auto destination{ |
| 594 | splitter_context.GetDesintationData(mix_info.dst_splitter_id, dest_id)}; | 594 | splitter_context.GetDestinationData(mix_info.dst_splitter_id, dest_id)}; |
| 595 | while (destination != nullptr) { | 595 | while (destination != nullptr) { |
| 596 | if (destination->IsConfigured()) { | 596 | if (destination->IsConfigured()) { |
| 597 | auto splitter_mix_id{destination->GetMixId()}; | 597 | auto splitter_mix_id{destination->GetMixId()}; |
| @@ -612,7 +612,7 @@ void CommandGenerator::GenerateMixCommands(MixInfo& mix_info) { | |||
| 612 | } | 612 | } |
| 613 | dest_id++; | 613 | dest_id++; |
| 614 | destination = | 614 | destination = |
| 615 | splitter_context.GetDesintationData(mix_info.dst_splitter_id, dest_id); | 615 | splitter_context.GetDestinationData(mix_info.dst_splitter_id, dest_id); |
| 616 | } | 616 | } |
| 617 | } | 617 | } |
| 618 | } else { | 618 | } else { |
diff --git a/src/audio_core/renderer/mix/mix_info.cpp b/src/audio_core/renderer/mix/mix_info.cpp index 5e44bde18..68bbe0aed 100644 --- a/src/audio_core/renderer/mix/mix_info.cpp +++ b/src/audio_core/renderer/mix/mix_info.cpp | |||
| @@ -93,7 +93,7 @@ bool MixInfo::UpdateConnection(EdgeMatrix& edge_matrix, const InParameter& in_pa | |||
| 93 | 93 | ||
| 94 | for (u32 i = 0; i < destination_count; i++) { | 94 | for (u32 i = 0; i < destination_count; i++) { |
| 95 | auto destination{ | 95 | auto destination{ |
| 96 | splitter_context.GetDesintationData(in_params.dest_splitter_id, i)}; | 96 | splitter_context.GetDestinationData(in_params.dest_splitter_id, i)}; |
| 97 | 97 | ||
| 98 | if (destination) { | 98 | if (destination) { |
| 99 | const auto destination_id{destination->GetMixId()}; | 99 | const auto destination_id{destination->GetMixId()}; |
diff --git a/src/audio_core/renderer/splitter/splitter_context.cpp b/src/audio_core/renderer/splitter/splitter_context.cpp index 686150ea6..d0f3b60c2 100644 --- a/src/audio_core/renderer/splitter/splitter_context.cpp +++ b/src/audio_core/renderer/splitter/splitter_context.cpp | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | namespace AudioCore::Renderer { | 10 | namespace AudioCore::Renderer { |
| 11 | 11 | ||
| 12 | SplitterDestinationData* SplitterContext::GetDesintationData(const s32 splitter_id, | 12 | SplitterDestinationData* SplitterContext::GetDestinationData(const s32 splitter_id, |
| 13 | const s32 destination_id) { | 13 | const s32 destination_id) { |
| 14 | return splitter_infos[splitter_id].GetData(destination_id); | 14 | return splitter_infos[splitter_id].GetData(destination_id); |
| 15 | } | 15 | } |
diff --git a/src/audio_core/renderer/splitter/splitter_context.h b/src/audio_core/renderer/splitter/splitter_context.h index 556e6dcc3..1c0b84671 100644 --- a/src/audio_core/renderer/splitter/splitter_context.h +++ b/src/audio_core/renderer/splitter/splitter_context.h | |||
| @@ -42,7 +42,7 @@ public: | |||
| 42 | * @param destination_id - Destination index within the splitter. | 42 | * @param destination_id - Destination index within the splitter. |
| 43 | * @return Pointer to the found destination. May be nullptr. | 43 | * @return Pointer to the found destination. May be nullptr. |
| 44 | */ | 44 | */ |
| 45 | SplitterDestinationData* GetDesintationData(s32 splitter_id, s32 destination_id); | 45 | SplitterDestinationData* GetDestinationData(s32 splitter_id, s32 destination_id); |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * Get a splitter from the given index. | 48 | * Get a splitter from the given index. |