From dbdcd14242f3cb68309a5a591f6aa3fbe068cafa Mon Sep 17 00:00:00 2001 From: SachinVin Date: Sun, 14 Jan 2024 23:24:37 +0530 Subject: [PATCH] crash fix? --- .../merryhime_3ds_audio/audio_test_biquad_filter.cpp | 3 +-- .../merryhime_3ds_audio/merry_audio/service_fixture.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tests/audio_core/merryhime_3ds_audio/audio_test_biquad_filter.cpp b/src/tests/audio_core/merryhime_3ds_audio/audio_test_biquad_filter.cpp index c7dd43e4190e..c38f6fc9278c 100644 --- a/src/tests/audio_core/merryhime_3ds_audio/audio_test_biquad_filter.cpp +++ b/src/tests/audio_core/merryhime_3ds_audio/audio_test_biquad_filter.cpp @@ -1,8 +1,8 @@ #include #include #include "audio_core/hle/shared_memory.h" -#include "merry_audio/merry_audio.h" #include "common/settings.h" +#include "merry_audio/merry_audio.h" TEST_CASE_METHOD(MerryAudio::MerryAudioFixture, "AudioTest-BiquadFilter", "[audio_core][merryhime_3ds_audio]") { @@ -33,7 +33,6 @@ TEST_CASE_METHOD(MerryAudio::MerryAudioFixture, "AudioTest-BiquadFilter", dspfirm = loadDspFirmFromFile(); if (!dspfirm.size()) { SKIP("Couldn't load firmware\n"); - goto end; } } auto ret = audioInit(dspfirm); diff --git a/src/tests/audio_core/merryhime_3ds_audio/merry_audio/service_fixture.cpp b/src/tests/audio_core/merryhime_3ds_audio/merry_audio/service_fixture.cpp index 922fe9c28936..9417cea971cc 100644 --- a/src/tests/audio_core/merryhime_3ds_audio/merry_audio/service_fixture.cpp +++ b/src/tests/audio_core/merryhime_3ds_audio/merry_audio/service_fixture.cpp @@ -124,8 +124,8 @@ void ServiceFixture::InitDspCore(Settings::AudioEmulation dsp_core) { if (dsp_core == Settings::AudioEmulation::HLE) { dsp = std::make_unique(system, memory, core_timing); } else { - dsp = std::make_unique(system, memory, core_timing, - dsp_core == Settings::AudioEmulation::LLEMultithreaded); + dsp = std::make_unique( + system, memory, core_timing, dsp_core == Settings::AudioEmulation::LLEMultithreaded); } dsp->SetInterruptHandler([this](Service::DSP::InterruptType type, AudioCore::DspPipe pipe) { interrupts_fired[static_cast(type)][static_cast(pipe)] = 1;