diff options
| author | robojumper <robojumper@gmail.com> | 2025-06-14 16:40:55 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-09-13 10:49:07 +0200 |
| commit | cb8c482c3b7e955f1ca274601567ed3785c3996b (patch) | |
| tree | 2024a87c430bc8447def892bf265e9113fa6f94b /src/nw4r | |
| parent | f730fa82862d9abef8c6745fdfea81f2bfcb957c (diff) | |
Getting somewhere
Diffstat (limited to 'src/nw4r')
| -rw-r--r-- | src/nw4r/snd/snd_BasicPlayer.cpp | 2 | ||||
| -rw-r--r-- | src/nw4r/snd/snd_BasicSound.cpp | 2 | ||||
| -rw-r--r-- | src/nw4r/snd/snd_Channel.cpp | 2 | ||||
| -rw-r--r-- | src/nw4r/snd/snd_SoundPlayer.cpp | 2 | ||||
| -rw-r--r-- | src/nw4r/snd/snd_Voice.cpp | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/nw4r/snd/snd_BasicPlayer.cpp b/src/nw4r/snd/snd_BasicPlayer.cpp index 4045f4b8..6b8cba05 100644 --- a/src/nw4r/snd/snd_BasicPlayer.cpp +++ b/src/nw4r/snd/snd_BasicPlayer.cpp @@ -32,7 +32,7 @@ void PlayerParamSet::Init() biquadType = 0; biquadValue = 0.0f; remoteFilter = 0; - outputLineFlag = 1; + outputLineFlag = OUTPUT_LINE_MAIN; mainOutVolume = 1.0f; mainSend = 0.0f; panMode = PAN_MODE_DUAL; diff --git a/src/nw4r/snd/snd_BasicSound.cpp b/src/nw4r/snd/snd_BasicSound.cpp index d6e29c09..f2b7931b 100644 --- a/src/nw4r/snd/snd_BasicSound.cpp +++ b/src/nw4r/snd/snd_BasicSound.cpp @@ -100,7 +100,7 @@ void BasicSound::InitParam() mLpfFreq = 0.0f; mBiquadFilterType = 0; mBiquadFilterValue = 0.0f; - mOutputLineFlag = mSoundPlayer ? mSoundPlayer->GetDefaultOutputLine() : 1; + mOutputLineFlag = mSoundPlayer ? mSoundPlayer->GetDefaultOutputLine() : OUTPUT_LINE_MAIN; mMainOutVolume = 1.0f; mMainSend = 0.0f; // clang-format on diff --git a/src/nw4r/snd/snd_Channel.cpp b/src/nw4r/snd/snd_Channel.cpp index 3d3456d8..1c92348b 100644 --- a/src/nw4r/snd/snd_Channel.cpp +++ b/src/nw4r/snd/snd_Channel.cpp @@ -143,7 +143,7 @@ void Channel::InitParam(Callback *callback, u32 callbackData) mBiquadType = 0; mBiquadValue = 0.0f; mRemoteFilter = 0; - mOutputLineFlag = 1; + mOutputLineFlag = OUTPUT_LINE_MAIN; mMainOutVolume = 1.0f; mMainSend = 0.0f; diff --git a/src/nw4r/snd/snd_SoundPlayer.cpp b/src/nw4r/snd/snd_SoundPlayer.cpp index 112135ec..a991dad2 100644 --- a/src/nw4r/snd/snd_SoundPlayer.cpp +++ b/src/nw4r/snd/snd_SoundPlayer.cpp @@ -34,7 +34,7 @@ SoundPlayer::SoundPlayer() : mPlayableLimit (INT_MAX), mVolume (1.0f), mLpfFreq (0.0f), - mOutputLineFlag (1), + mOutputLineFlag (OUTPUT_LINE_MAIN), mMainOutVolume (1.0f), mBiquadType (0), mBiquadValue (0.0f), diff --git a/src/nw4r/snd/snd_Voice.cpp b/src/nw4r/snd/snd_Voice.cpp index b422b842..dd19828c 100644 --- a/src/nw4r/snd/snd_Voice.cpp +++ b/src/nw4r/snd/snd_Voice.cpp @@ -129,7 +129,7 @@ void Voice::InitParam(int channelCount, int voiceOutCount, Callback *callback, mBiquadValue = 0.0f; mPan = 0.0f; mSurroundPan = 0.0f; - mOutputLineFlag = 1; + mOutputLineFlag = OUTPUT_LINE_MAIN; mMainOutVolume = 1.0f; mMainSend = 1.0f; @@ -873,7 +873,7 @@ bool Voice::CalcAxMix() CalcMixParam(channelIndex, voiceOutIndex, &mix, &rmtmix); nextUpdateFlag |= axVoice->SetMix(mix); - if (mOutputLineFlag == 0 || mOutputLineFlag == 1) { + if (mOutputLineFlag == 0 || mOutputLineFlag == OUTPUT_LINE_MAIN) { axVoice->EnableRemote(false); } else { axVoice->EnableRemote(true); @@ -1077,7 +1077,7 @@ void Voice::CalcMixParam(int channelIndex, int voiceOutIndex, f32 fxSendB = 0.0f; f32 fxSendC = 0.0f; - if (mOutputLineFlag & 1) // OUTPUT_LINE_MAIN + if (mOutputLineFlag & OUTPUT_LINE_MAIN) { mainVolume = mMainOutVolume; mainSend = mMainSend; |