mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-01 18:52:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'skmp/fix-stream-volume-fades' into 'main'

Browse Source 
streams: Update volumes on SetMusicMasterVolume/SetMusicFadeVolume

See merge request skmp/dca3-game!84
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-29 14:48:38 +00:00
parent 2cb15f3728 82bc55c3d4
commit 59a75bf12b
4 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/liberty/audio/sampman.h
View File

@@ -173,6 +173,7 @@ public:
char GetCDAudioDriveLetter (void); char GetCDAudioDriveLetter (void);
void UpdateEffectsVolume(void); void UpdateEffectsVolume(void);
void UpdateStreamsVolume(void);
#ifdef DC_SH4 #ifdef DC_SH4
void UpdateChannelVolume(uint32 nChannel); void UpdateChannelVolume(uint32 nChannel);

19
src/liberty/audio/sampman_dc.cpp
View File

@@ -545,6 +545,7 @@ void
cSampleManager::SetMusicMasterVolume(uint8 nVolume) cSampleManager::SetMusicMasterVolume(uint8 nVolume)
{ {
m_nMusicVolume = nVolume; m_nMusicVolume = nVolume;
UpdateStreamsVolume();
} }
void void
@@ -558,6 +559,7 @@ void
cSampleManager::SetMusicFadeVolume(uint8 nVolume) cSampleManager::SetMusicFadeVolume(uint8 nVolume)
{ {
m_nMusicFadeVolume = nVolume; m_nMusicFadeVolume = nVolume;
UpdateStreamsVolume();
} }
void void
@@ -1228,12 +1230,29 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
return rv; return rv;
} }
static uint8 nStreamVolumes[MAX_STREAMS];
static uint8 nStreamPans[MAX_STREAMS];
static uint8 nStreamEffect[MAX_STREAMS];
void
cSampleManager::UpdateStreamsVolume(void)
{
if(_bSampmanInitialised) {
for (int nStream = 0; nStream < MAX_STREAMS; nStream++) {
SetStreamedVolumeAndPan(nStreamVolumes[nStream], nStreamPans[nStream], nStreamEffect[nStream], nStream);
}
}
}
void void
cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream) cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream)
{ {
ASSERT( nStream < MAX_STREAMS ); ASSERT( nStream < MAX_STREAMS );
if (nVolume > MAX_VOLUME) if (nVolume > MAX_VOLUME)
nVolume = MAX_VOLUME; nVolume = MAX_VOLUME;
nStreamVolumes[nStream] = nVolume;
nStreamPans[nStream] = nPan;
nStreamEffect[nStream] = nEffectFlag;
nVolume = linearlize_volume(nVolume); //nVolume * 255 / MAX_VOLUME; nVolume = linearlize_volume(nVolume); //nVolume * 255 / MAX_VOLUME;
nVolume = m_nMusicFadeVolume * nVolume * m_nMusicVolume >> 14; nVolume = m_nMusicFadeVolume * nVolume * m_nMusicVolume >> 14;
if (streams[nStream].vol != nVolume || streams[nStream].nPan != nPan) { if (streams[nStream].vol != nVolume || streams[nStream].nPan != nPan) {

1
src/miami/audio/sampman.h
View File

@@ -198,6 +198,7 @@ public:
char GetCDAudioDriveLetter (void); char GetCDAudioDriveLetter (void);
void UpdateEffectsVolume(void); void UpdateEffectsVolume(void);
void UpdateStreamsVolume(void);
#ifdef DC_SH4 #ifdef DC_SH4
void UpdateChannelVolume(uint32 nChannel); void UpdateChannelVolume(uint32 nChannel);

19
src/miami/audio/sampman_dc.cpp
View File

@@ -538,7 +538,6 @@ cSampleManager::UpdateEffectsVolume(void)
} }
} }
void void
cSampleManager::SetEffectsMasterVolume(uint8 nVolume) cSampleManager::SetEffectsMasterVolume(uint8 nVolume)
{ {
@@ -550,6 +549,7 @@ void
cSampleManager::SetMusicMasterVolume(uint8 nVolume) cSampleManager::SetMusicMasterVolume(uint8 nVolume)
{ {
m_nMusicVolume = nVolume; m_nMusicVolume = nVolume;
UpdateStreamsVolume();
} }
void void
@@ -569,6 +569,7 @@ void
cSampleManager::SetMusicFadeVolume(uint8 nVolume) cSampleManager::SetMusicFadeVolume(uint8 nVolume)
{ {
m_nMusicFadeVolume = nVolume; m_nMusicFadeVolume = nVolume;
UpdateStreamsVolume();
} }
void void
@@ -1310,12 +1311,28 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
return rv; return rv;
} }
static uint8 nStreamVolumes[MAX_STREAMS];
static uint8 nStreamPans[MAX_STREAMS];
static uint8 nStreamEffect[MAX_STREAMS];
void
cSampleManager::UpdateStreamsVolume(void)
{
if(_bSampmanInitialised) {
for (int nStream = 0; nStream < MAX_STREAMS; nStream++) {
SetStreamedVolumeAndPan(nStreamVolumes[nStream], nStreamPans[nStream], nStreamEffect[nStream], nStream);
}
}
}
void void
cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream) cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream)
{ {
ASSERT( nStream < MAX_STREAMS ); ASSERT( nStream < MAX_STREAMS );
if (nVolume > MAX_VOLUME) if (nVolume > MAX_VOLUME)
nVolume = MAX_VOLUME; nVolume = MAX_VOLUME;
nStreamVolumes[nStream] = nVolume;
nStreamPans[nStream] = nPan;
nStreamEffect[nStream] = nEffectFlag;
nVolume = linearlize_volume(nVolume); //nVolume * 255 / MAX_VOLUME; nVolume = linearlize_volume(nVolume); //nVolume * 255 / MAX_VOLUME;
nVolume = m_nMusicFadeVolume * nVolume * m_nMusicVolume >> 14; nVolume = m_nMusicFadeVolume * nVolume * m_nMusicVolume >> 14;
if (streams[nStream].vol != nVolume || streams[nStream].nPan != nPan) { if (streams[nStream].vol != nVolume || streams[nStream].nPan != nPan) {