mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-28 06:57:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

JAudio field name/comment pass

Browse Source 
HUGE thanks to XAYRGA for their work documenting JAudio file formats
This commit is contained in:
PJB3005
2026-03-11 21:50:46 +01:00
parent 5db0cb0cf8
commit 06dc511212
34 changed files with 518 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Z2AudioLib/Z2AudioMgr.cpp
+5 -5
View File
@@ -30,15 +30,15 @@ Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive* seqArc) {
JAU_JASInitializer JASInitializer;
JASInitializer.audioMemSize_ = memSize;
JASInitializer.field_0x1c = 140;
JASInitializer.mJasTrackPoolSize = 140;
JASInitializer.dspLevel_ = 1.3f;
JASInitializer.waveArcDir_ = "Audiores/Waves/";
JASInitializer.initJASystem(heap);
JAU_JAIInitializer JAIInitializer;
JAIInitializer.field_0x0 = 78;
JAIInitializer.field_0x4 = 4;
JAIInitializer.field_0xc = 48;
JAIInitializer.mJaiSePoolSize = 78;
JAIInitializer.mJaiSeqPoolSize = 4;
JAIInitializer.mJaiSoundChildPoolSize = 48;
JAIInitializer.initJAInterface();
JAISeMgr* seMgr = mSoundMgr.getSeMgr();
@@ -157,7 +157,7 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive
}
void Z2AudioMgr::setOutputMode(u32 mode) {
if (mode <= 2) {
if (mode <= JAS_OUTPUT_SURROUND) {
JAISetOutputMode(mode);
}
}
src/d/actor/d_a_movie_player.cpp
+1 -1
View File
@@ -3268,7 +3268,7 @@ static void daMP_MixAudio(s16* destination, s16*, u32 sample) {
if (r_mix > 32767)
r_mix = 32767;
if (JASDriver::getOutputMode() == 0) {
if (JASDriver::getOutputMode() == JAS_OUTPUT_MONO) {
l_mix = r_mix = ((r_mix >> 1) + (l_mix >> 1));
r_mix = (s16)r_mix;
l_mix = (s16)l_mix;
src/d/d_menu_option.cpp
+8 -6
View File
@@ -24,6 +24,8 @@
#include "m_Do/m_Do_graphic.h"
#include <cstring>
#include "JSystem/JAudio2/JASDriverIF.h"
typedef void (dMenu_Option_c::*initFunc)();
static initFunc init[] = {
&dMenu_Option_c::atten_init,
@@ -89,7 +91,7 @@ dMenu_Option_c::dMenu_Option_c(JKRArchive* i_archive, STControl* i_stick) {
dMenu_Option_c::~dMenu_Option_c() {}
static const u32 dMo_soundMode[3] = {0, 1, 2};
static const u32 dMo_soundMode[3] = {JAS_OUTPUT_MONO, JAS_OUTPUT_STEREO, JAS_OUTPUT_SURROUND};
void dMenu_Option_c::_create() {
static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')};
@@ -1755,13 +1757,13 @@ void dMenu_Option_c::screenSet() {
}
}
void dMenu_Option_c::setSoundMode(u32 param_0) {
switch (param_0) {
case 0:
void dMenu_Option_c::setSoundMode(u32 soundMode) {
switch (soundMode) {
case JAS_OUTPUT_MONO:
OSSetSoundMode(OS_SOUND_MODE_MONO);
break;
case 1:
case 2:
case JAS_OUTPUT_STEREO:
case JAS_OUTPUT_SURROUND: // Via dolby pro logic 2, so it's over 2 output channels.
OSSetSoundMode(OS_SOUND_MODE_STEREO);
break;
}