diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index fcc6e1e4a1..72a20b6792 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -1100,7 +1100,7 @@ void AudioClient::mixLocalAudioInjectors(float* mixBuffer) { static const int HRTF_DATASET_INDEX = 1; - int numChannels = injector->isAmbisonic() ? 4 : (injector->isStereo() ? 2 : 1); + int numChannels = injector->isAmbisonic() ? AudioConstants::AMBISONIC : (injector->isStereo() ? AudioConstants::STEREO : AudioConstants::MONO); qint64 bytesToRead = numChannels * AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL; // get one frame from the injector diff --git a/libraries/audio/src/AudioConstants.h b/libraries/audio/src/AudioConstants.h index 9172b8e859..6d9678c368 100644 --- a/libraries/audio/src/AudioConstants.h +++ b/libraries/audio/src/AudioConstants.h @@ -20,7 +20,7 @@ namespace AudioConstants { const int SAMPLE_RATE = 24000; const int MONO = 1; const int STEREO = 2; - + const int AMBISONIC = 4; typedef int16_t AudioSample; const int SAMPLE_SIZE = sizeof(AudioSample); @@ -33,7 +33,7 @@ namespace AudioConstants { const int NETWORK_FRAME_SAMPLES_STEREO = NETWORK_FRAME_BYTES_STEREO / SAMPLE_SIZE; const int NETWORK_FRAME_BYTES_PER_CHANNEL = NETWORK_FRAME_BYTES_STEREO / 2; const int NETWORK_FRAME_SAMPLES_PER_CHANNEL = NETWORK_FRAME_BYTES_PER_CHANNEL / SAMPLE_SIZE; - const int NETWORK_FRAME_SAMPLES_AMBISONIC = NETWORK_FRAME_SAMPLES_PER_CHANNEL * 4; + const int NETWORK_FRAME_SAMPLES_AMBISONIC = NETWORK_FRAME_SAMPLES_PER_CHANNEL * AMBISONIC; const float NETWORK_FRAME_SECS = (AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL / float(AudioConstants::SAMPLE_RATE)); const float NETWORK_FRAME_MSECS = NETWORK_FRAME_SECS * 1000.0f; const float NETWORK_FRAMES_PER_SEC = 1.0f / NETWORK_FRAME_SECS;