aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-12-01 15:36:25 -0800
committerChris Robinson <[email protected]>2019-12-01 15:36:25 -0800
commitb79aa323080957e1efab8b87dbbba550b17e913d (patch)
tree15f5cd9c935cf2ca64eb8e67ef8cf253e04e8850
parent9559f7bfc29350ffb71cbd4c14f11c6de927c781 (diff)
Store the ambisonic order for the voice
Currently only first-order B-Format is possible for a buffer/source, but this will begin to allow for higher orders with an appropriate extension.
-rw-r--r--al/source.cpp1
-rw-r--r--alc/voice.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/al/source.cpp b/al/source.cpp
index 8b8e6382..04fd3b66 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -2788,6 +2788,7 @@ START_API_FUNC
ALbuffer *buffer{BufferList->mBuffer};
voice->mFrequency = buffer->Frequency;
voice->mFmtChannels = buffer->mFmtChannels;
+ voice->mAmbiOrder = 1;
voice->mNumChannels = ChannelsFromFmt(buffer->mFmtChannels);
voice->mSampleSize = BytesFromFmt(buffer->mFmtType);
diff --git a/alc/voice.h b/alc/voice.h
index e15c5ec1..af2b5dba 100644
--- a/alc/voice.h
+++ b/alc/voice.h
@@ -211,6 +211,7 @@ struct ALvoice {
/* Properties for the attached buffer(s). */
FmtChannels mFmtChannels;
+ ALuint mAmbiOrder;
ALuint mFrequency;
ALuint mNumChannels;
ALuint mSampleSize;
@@ -269,6 +270,7 @@ struct ALvoice {
std::memory_order_relaxed);
mFmtChannels = rhs.mFmtChannels;
+ mAmbiOrder = rhs.mAmbiOrder;
mFrequency = rhs.mFrequency;
mNumChannels = rhs.mNumChannels;
mSampleSize = rhs.mSampleSize;