AudioSubmix reference fix; macOS window icon

This commit is contained in:
Jack Andersen
2018-01-13 20:37:17 -10:00
parent cbfd4ddad0
commit 5d310c008f
3 changed files with 16 additions and 4 deletions

View File

@@ -169,7 +169,7 @@ size_t AudioVoiceMono::_pumpAndMix(size_t frames)
}
else
{
AudioSubmix& smx = reinterpret_cast<AudioSubmix&>(m_head->m_mainSubmix);
AudioSubmix& smx = *m_head->m_mainSubmix;
m_cb->routeAudio(oDone, 1, dt, m_head->m_mainSubmix->m_busId, scratchPre.data(), scratchPost.data());
DefaultMonoMtx.mixMonoSampleData(m_head->clientMixInfo(), scratchPost.data(),
smx._getMergeBuf<T>(oDone), oDone);
@@ -319,7 +319,7 @@ size_t AudioVoiceStereo::_pumpAndMix(size_t frames)
}
else
{
AudioSubmix& smx = reinterpret_cast<AudioSubmix&>(m_head->m_mainSubmix);
AudioSubmix& smx = *m_head->m_mainSubmix;
m_cb->routeAudio(oDone, 2, dt, m_head->m_mainSubmix->m_busId, scratchPre.data(), scratchPost.data());
DefaultStereoMtx.mixStereoSampleData(m_head->clientMixInfo(), scratchPost.data(),
smx._getMergeBuf<T>(oDone), oDone);