From 4bcd2fbb2e79419c9b0973b7587df47d20004a5f Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 31 Jul 2016 07:46:38 -0700 Subject: Add an option to specify the ambisonic output configuration --- OpenAL32/Include/alMain.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'OpenAL32/Include') diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index d07cb589..dff94487 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -463,6 +463,14 @@ inline ALuint FrameSizeFromDevFmt(enum DevFmtChannels chans, enum DevFmtType typ return ChannelsFromDevFmt(chans) * BytesFromDevFmt(type); } +enum AmbiFormat { + AmbiFormat_FuMa, /* FuMa channel order and normalization */ + AmbiFormat_ACN_SN3D, /* ACN channel order and SN3D normalization */ + AmbiFormat_ACN_N3D, /* ACN channel order and N3D normalization */ + + AmbiFormat_Default = AmbiFormat_ACN_SN3D +}; + extern const struct EffectList { const char *name; @@ -557,6 +565,10 @@ struct ALCdevice_struct enum DevFmtChannels FmtChans; enum DevFmtType FmtType; ALboolean IsHeadphones; + /* For DevFmtAmbi* output only, specifies the channel order and + * normalization. + */ + enum AmbiFormat AmbiFmt; al_string DeviceName; -- cgit v1.2.3