diff options
author | Chris Robinson <[email protected]> | 2023-03-19 19:03:35 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2023-03-19 19:03:35 -0700 |
commit | d4bfb62591be4682238f72825c293f0416956934 (patch) | |
tree | ea40fb8572fbf64d076b60dbf62e3a4251e622fb /al/buffer.h | |
parent | f53b31b2c14b6f35dcda8c33c880c2fa79fe0f4b (diff) |
Remove the separate UserFmt types
All caller-usable formats are available as core formats now, so there's no
reason to distinguish between them.
Diffstat (limited to 'al/buffer.h')
-rw-r--r-- | al/buffer.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/al/buffer.h b/al/buffer.h index 3a799aab..da7da740 100644 --- a/al/buffer.h +++ b/al/buffer.h @@ -22,39 +22,12 @@ enum class EaxStorage : uint8_t { }; #endif // ALSOFT_EAX -/* User formats */ -enum UserFmtType : unsigned char { - UserFmtUByte = FmtUByte, - UserFmtShort = FmtShort, - UserFmtFloat = FmtFloat, - UserFmtMulaw = FmtMulaw, - UserFmtAlaw = FmtAlaw, - UserFmtDouble = FmtDouble, - UserFmtIMA4 = FmtIMA4, - UserFmtMSADPCM = FmtMSADPCM, -}; -enum UserFmtChannels : unsigned char { - UserFmtMono = FmtMono, - UserFmtStereo = FmtStereo, - UserFmtRear = FmtRear, - UserFmtQuad = FmtQuad, - UserFmtX51 = FmtX51, - UserFmtX61 = FmtX61, - UserFmtX71 = FmtX71, - UserFmtBFormat2D = FmtBFormat2D, - UserFmtBFormat3D = FmtBFormat3D, - UserFmtUHJ2 = FmtUHJ2, - UserFmtUHJ3 = FmtUHJ3, - UserFmtUHJ4 = FmtUHJ4, -}; - struct ALbuffer : public BufferStorage { ALbitfieldSOFT Access{0u}; al::vector<al::byte,16> mData; - UserFmtType OriginalType{UserFmtShort}; ALuint OriginalSize{0}; ALuint UnpackAlign{0}; |