AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-09 13:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better volume handling

Browse Source
This commit is contained in:
Jack Andersen
2017-02-05 17:21:38 -10:00
parent 2e7345f11d
commit aff8880595
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Voice.cpp
View File

@@ -192,7 +192,7 @@ std::list<std::shared_ptr<Voice>>::iterator Voice::_destroyVoice(std::list<std::
template <typename T>
static T ApplyVolume(float vol, T samp)
{
return samp * 0.5f * vol;
return samp * 0.7f * vol;
}
void Voice::_procSamplePre(int16_t& samp)
@@ -219,7 +219,7 @@ void Voice::_procSamplePre(int16_t& samp)
float l = clamp(0.f, m_lastLevel * (1.f - t) + m_nextLevel * t, 1.f);
/* Apply total volume to sample using decibel scale */
samp = ApplyVolume(l, samp);
samp = ApplyVolume(l * m_engine.m_masterVolume, samp);
return;
}
@@ -313,7 +313,7 @@ void Voice::_procSamplePre(int16_t& samp)
m_nextLevel = clamp(0.f, m_nextLevel, 1.f);
/* Apply total volume to sample using decibel scale */
samp = ApplyVolume(m_nextLevel, samp);
samp = ApplyVolume(m_nextLevel * m_engine.m_masterVolume, samp);
}
template <typename T>