From d0b5ee486c7cb100d69b92178140bc02bede2e3e Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 22 Oct 2023 12:27:29 -0700 Subject: [PATCH] JASRate --- configure.py | 2 +- include/JSystem/JAudio/JASRate.h | 17 +++++++++++++++++ src/JSystem/JAudio/JASRate.cpp | 9 +++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 include/JSystem/JAudio/JASRate.h diff --git a/configure.py b/configure.py index fe663da47..a4337c8d3 100644 --- a/configure.py +++ b/configure.py @@ -654,7 +654,7 @@ config.libs = [ Object(NonMatching, "JSystem/JAudio/JASAiCtrl.cpp"), Object(NonMatching, "JSystem/JAudio/JASDvdThread.cpp"), Object(NonMatching, "JSystem/JAudio/JASCallback.cpp"), - Object(NonMatching, "JSystem/JAudio/JASRate.cpp"), + Object(Matching, "JSystem/JAudio/JASRate.cpp"), Object(NonMatching, "JSystem/JAudio/JASHardStream.cpp"), Object(NonMatching, "JSystem/JAudio/JASHeapCtrl.cpp"), Object(NonMatching, "JSystem/JAudio/JASResArcLoader.cpp"), diff --git a/include/JSystem/JAudio/JASRate.h b/include/JSystem/JAudio/JASRate.h new file mode 100644 index 000000000..29260f582 --- /dev/null +++ b/include/JSystem/JAudio/JASRate.h @@ -0,0 +1,17 @@ +#ifndef JASRATE_H +#define JASRATE_H + +#include "dolphin/types.h" + +namespace JASystem { + namespace Kernel { + extern f32 gDacRate; + extern u32 gSubFrames; + extern int gFrameSamples; + extern u32 gDacSize; + extern int gOutputRate; + extern int gAiSetting; + } +} + +#endif /* JASRATE_H */ diff --git a/src/JSystem/JAudio/JASRate.cpp b/src/JSystem/JAudio/JASRate.cpp index 7d5898e12..7307b897d 100644 --- a/src/JSystem/JAudio/JASRate.cpp +++ b/src/JSystem/JAudio/JASRate.cpp @@ -3,6 +3,11 @@ // Translation Unit: JASRate.cpp // -#include "JASRate.h" -#include "dolphin/types.h" +#include "JSystem/JAudio/JASRate.h" +f32 JASystem::Kernel::gDacRate = 32028.5f; +u32 JASystem::Kernel::gSubFrames = 7; +int JASystem::Kernel::gFrameSamples = 560; +u32 JASystem::Kernel::gDacSize = 1120; +int JASystem::Kernel::gOutputRate; +int JASystem::Kernel::gAiSetting;