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

Revert refactor collateral

This commit is contained in:
Jack Andersen 2016-01-29 15:45:40 -10:00
parent 9e543102fe
commit 70c4443eb7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/audiodev/AQS.cpp
View File

@ -31,7 +31,7 @@ static AudioChannel AQSChannelToBooChannel(AudioChannelLabel ch)
return AudioChannel::Unknown;
}
struct XA2AudioVoice : IAudioVoice
struct AQSAudioVoice : IAudioVoice
{
ChannelMap m_map;
IAudioVoiceCallback* m_cb;
@ -46,13 +46,13 @@ struct XA2AudioVoice : IAudioVoice
unsigned m_primeBuf;
static void Callback(void* inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer)
{
XA2AudioVoice* voice = static_cast<XA2AudioVoice*>(inUserData);
AQSAudioVoice* voice = static_cast<AQSAudioVoice*>(inUserData);
voice->m_callbackBuf = inBuffer;
voice->m_cb->needsNextBuffer(voice, voice->m_bufferFrames);
voice->m_callbackBuf = nullptr;
}
XA2AudioVoice(AudioChannelSet set, unsigned sampleRate, IAudioVoiceCallback* cb)
AQSAudioVoice(AudioChannelSet set, unsigned sampleRate, IAudioVoiceCallback* cb)
: m_cb(cb)
{
unsigned chCount = ChannelCount(set);
@ -171,7 +171,7 @@ struct XA2AudioVoice : IAudioVoice
AudioQueuePrime(m_queue, 0, nullptr);
}
~XA2AudioVoice()
~AQSAudioVoice()
{
AudioQueueDispose(m_queue, false);
}
@ -204,13 +204,13 @@ struct XA2AudioVoice : IAudioVoice
}
};
struct XA2AudioVoiceAllocator : IAudioVoiceAllocator
struct AQSAudioVoiceAllocator : IAudioVoiceAllocator
{
std::unique_ptr<IAudioVoice> allocateNewVoice(AudioChannelSet layoutOut,
unsigned sampleRate,
IAudioVoiceCallback* cb)
{
XA2AudioVoice* newVoice = new XA2AudioVoice(layoutOut, sampleRate, cb);
AQSAudioVoice* newVoice = new AQSAudioVoice(layoutOut, sampleRate, cb);
std::unique_ptr<IAudioVoice> ret(newVoice);
if (!newVoice->m_queue)
return {};