AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Voice lifetime and emitter bug fixes

This commit is contained in:
Jack Andersen 2017-11-27 16:44:35 -10:00
parent ebe6f18898
commit 3c7cf5515f
3 changed files with 83 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Emitter.cpp
View File

@ -17,7 +17,7 @@ Emitter::~Emitter() {}
Emitter::Emitter(Engine& engine, const AudioGroup& group, const std::shared_ptr<Voice>& vox,
float maxDist, float minVol, float falloff, bool doppler)
: Entity(engine, group, vox->getObjectId()), m_vox(vox), m_maxDist(maxDist),
: Entity(engine, group, vox->getGroupId(), vox->getObjectId()), m_vox(vox), m_maxDist(maxDist),
m_minVol(clamp(0.f, minVol, 1.f)), m_falloff(clamp(-1.f, falloff, 1.f)), m_doppler(doppler)
{
}
@ -86,15 +86,18 @@ void Emitter::_update()
/* Calculate attenuation */
float att = _attenuationCurve(dist);
att = (1.f - att) * m_minVol + att * m_maxVol;
if (att > FLT_EPSILON)
{
att = (1.f - att) * m_minVol + att * m_maxVol;
/* Apply pan law */
float thisCoefs[8] = {};
m_vox->_panLaw(thisCoefs, frontPan, backPan, span);
/* Apply pan law */
float thisCoefs[8] = {};
m_vox->_panLaw(thisCoefs, frontPan, backPan, span);
/* Take maximum coefficient across listeners */
for (int i=0 ; i<8 ; ++i)
coefs[i] = std::max(coefs[i], thisCoefs[i] * att * listener->m_volume);
/* Take maximum coefficient across listeners */
for (int i = 0; i < 8; ++i)
coefs[i] = std::max(coefs[i], thisCoefs[i] * att * listener->m_volume);
}
/* Calculate doppler */
if (m_doppler)

11
lib/Engine.cpp
View File

@ -339,19 +339,18 @@ std::shared_ptr<Emitter> Engine::addEmitter(const float* pos, const float* dir,
std::list<std::shared_ptr<Voice>>::iterator vox =
_allocateVoice(*grp, std::get<1>(search->second), NativeSampleRate, true, true, smx);
auto emitIt = m_activeEmitters.emplace(m_activeEmitters.end(),
new Emitter(*this, *grp, *vox, maxDist, minVol, falloff, doppler));
Emitter& ret = *(*emitIt);
ObjectId oid = (grp->getDataFormat() == DataFormat::PC) ? entry->objId : SBig(entry->objId);
if (!ret.getVoice()->loadSoundObject(oid, 0, 1000.f, entry->defKey, entry->defVel, 0))
if (!(*vox)->loadSoundObject(oid, 0, 1000.f, entry->defKey, entry->defVel, 0))
{
ret._destroy();
m_activeEmitters.erase(emitIt);
_destroyVoice(vox);
return {};
}
auto emitIt = m_activeEmitters.emplace(m_activeEmitters.end(),
new Emitter(*this, *grp, *vox, maxDist, minVol, falloff, doppler));
Emitter& ret = *(*emitIt);
ret.getVoice()->setPan(entry->panning);
ret.setVectors(pos, dir);
ret.setMaxVol(maxVol);

68
lib/Voice.cpp
View File

@ -814,17 +814,29 @@ bool Voice::_loadLayer(const std::vector<const LayerMapping*>& layer, int macroS
bool Voice::loadSoundObject(ObjectId objectId, int macroStep, double ticksPerSec, uint8_t midiKey, uint8_t midiVel,
uint8_t midiMod, bool pushPc)
{
if (m_destroyed)
return false;
const unsigned char* macroData = m_audioGroup.getPool().soundMacro(objectId);
if (macroData)
{
m_objectId = objectId;
return _loadSoundMacro(macroData, macroStep, ticksPerSec, midiKey, midiVel, midiMod, pushPc);
}
const Keymap* keymap = m_audioGroup.getPool().keymap(objectId);
if (keymap)
{
m_objectId = objectId;
return _loadKeymap(keymap, macroStep, ticksPerSec, midiKey, midiVel, midiMod, pushPc);
}
const std::vector<const LayerMapping*>* layer = m_audioGroup.getPool().layer(objectId);
if (layer)
{
m_objectId = objectId;
return _loadLayer(*layer, macroStep, ticksPerSec, midiKey, midiVel, midiMod, pushPc);
}
return false;
}
@ -843,6 +855,9 @@ void Voice::_macroKeyOff()
void Voice::keyOff()
{
if (m_destroyed)
return;
if (m_keyoffTrap.macroId != 0xffff)
{
if (m_keyoffTrap.macroId == m_state.m_header.m_macroId)
@ -864,6 +879,9 @@ void Voice::keyOff()
void Voice::message(int32_t val)
{
if (m_destroyed)
return;
m_messageQueue.push_back(val);
if (m_messageTrap.macroId != 0xffff)
@ -879,6 +897,9 @@ void Voice::message(int32_t val)
void Voice::startSample(int16_t sampId, int32_t offset)
{
if (m_destroyed)
return;
m_curSample = m_audioGroup.getSample(sampId);
if (m_curSample)
{
@ -942,6 +963,9 @@ void Voice::stopSample() { m_curSample = nullptr; }
void Voice::setVolume(float vol)
{
if (m_destroyed)
return;
m_targetUserVol = clamp(0.f, vol, 1.f);
for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->setVolume(vol);
@ -1045,7 +1069,7 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
void Voice::_setPan(float pan)
{
if (m_emitter)
if (m_destroyed || m_emitter)
return;
m_curPan = clamp(-1.f, pan, 1.f);
@ -1058,6 +1082,9 @@ void Voice::_setPan(float pan)
void Voice::setPan(float pan)
{
if (m_destroyed)
return;
m_userPan = pan;
_setPan(m_curPan);
for (std::shared_ptr<Voice>& vox : m_childVoices)
@ -1072,6 +1099,9 @@ void Voice::_setSurroundPan(float span)
void Voice::setSurroundPan(float span)
{
if (m_destroyed)
return;
m_userSpan = span;
_setSurroundPan(m_curSpan);
for (std::shared_ptr<Voice>& vox : m_childVoices)
@ -1087,6 +1117,9 @@ void Voice::_setChannelCoefs(const float coefs[8])
void Voice::setChannelCoefs(const float coefs[8])
{
if (m_destroyed)
return;
_setChannelCoefs(coefs);
for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->setChannelCoefs(coefs);
@ -1134,6 +1167,9 @@ void Voice::setPitchKey(int32_t cents)
void Voice::setPedal(bool pedal)
{
if (m_destroyed)
return;
if (m_sustained && !pedal && m_sustainKeyOff)
{
m_sustainKeyOff = false;
@ -1180,6 +1216,9 @@ void Voice::setPitchSweep2(uint8_t times, int16_t add)
void Voice::setReverbVol(float rvol)
{
if (m_destroyed)
return;
m_curReverbVol = clamp(0.f, rvol, 1.f);
for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->setReverbVol(rvol);
@ -1187,6 +1226,9 @@ void Voice::setReverbVol(float rvol)
void Voice::setAuxBVol(float bvol)
{
if (m_destroyed)
return;
m_curAuxBVol = clamp(0.f, bvol, 1.f);
for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->setAuxBVol(bvol);
@ -1194,6 +1236,9 @@ void Voice::setAuxBVol(float bvol)
void Voice::setAdsr(ObjectId adsrId, bool dls)
{
if (m_destroyed)
return;
if (dls)
{
const ADSRDLS* adsr = m_audioGroup.getPool().tableAsAdsrDLS(adsrId);
@ -1218,6 +1263,9 @@ void Voice::setAdsr(ObjectId adsrId, bool dls)
void Voice::setPitchFrequency(uint32_t hz, uint16_t fine)
{
if (m_destroyed)
return;
m_sampleRate = hz + fine / 65536.0;
m_backendVoice->setPitchRatio(1.0, false);
m_backendVoice->resetSampleRate(m_sampleRate);
@ -1225,6 +1273,9 @@ void Voice::setPitchFrequency(uint32_t hz, uint16_t fine)
void Voice::setPitchAdsr(ObjectId adsrId, int32_t cents)
{
if (m_destroyed)
return;
const ADSRDLS* adsr = m_audioGroup.getPool().tableAsAdsrDLS(adsrId);
if (adsr)
{
@ -1236,6 +1287,9 @@ void Voice::setPitchAdsr(ObjectId adsrId, int32_t cents)
void Voice::_setPitchWheel(float pitchWheel)
{
if (m_destroyed)
return;
if (pitchWheel > 0.f)
m_pitchWheelVal = m_pitchWheelUp * m_curPitchWheel;
else if (pitchWheel < 0.f)
@ -1247,6 +1301,9 @@ void Voice::_setPitchWheel(float pitchWheel)
void Voice::setPitchWheel(float pitchWheel)
{
if (m_destroyed)
return;
m_curPitchWheel = amuse::clamp(-1.f, pitchWheel, 1.f);
_setPitchWheel(m_curPitchWheel);
@ -1256,6 +1313,9 @@ void Voice::setPitchWheel(float pitchWheel)
void Voice::setPitchWheelRange(int8_t up, int8_t down)
{
if (m_destroyed)
return;
m_pitchWheelUp = up * 100;
m_pitchWheelDown = down * 100;
_setPitchWheel(m_curPitchWheel);
@ -1263,6 +1323,9 @@ void Voice::setPitchWheelRange(int8_t up, int8_t down)
void Voice::setAftertouch(uint8_t aftertouch)
{
if (m_destroyed)
return;
m_curAftertouch = aftertouch;
for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->setAftertouch(aftertouch);
@ -1327,6 +1390,9 @@ size_t Voice::getTotalVoices() const
void Voice::kill()
{
if (m_destroyed)
return;
m_voxState = VoiceState::Dead;
m_backendVoice->stop();
for (const std::shared_ptr<Voice>& vox : m_childVoices)