diff --git a/lib/audiodev/AQS.cpp b/lib/audiodev/AQS.cpp index 7f8c8b4..f638745 100644 --- a/lib/audiodev/AQS.cpp +++ b/lib/audiodev/AQS.cpp @@ -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(inUserData); + AQSAudioVoice* voice = static_cast(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 allocateNewVoice(AudioChannelSet layoutOut, unsigned sampleRate, IAudioVoiceCallback* cb) { - XA2AudioVoice* newVoice = new XA2AudioVoice(layoutOut, sampleRate, cb); + AQSAudioVoice* newVoice = new AQSAudioVoice(layoutOut, sampleRate, cb); std::unique_ptr ret(newVoice); if (!newVoice->m_queue) return {};