Use explicit storage types for some enums

This commit is contained in:
Chris Robinson
2019-06-30 17:41:43 -07:00
parent f458642237
commit c21b7e2461
2 changed files with 7 additions and 7 deletions
+4 -4
View File
@@ -12,7 +12,7 @@
/* User formats */
enum UserFmtType {
enum UserFmtType : unsigned char {
UserFmtUByte,
UserFmtShort,
UserFmtFloat,
@@ -22,7 +22,7 @@ enum UserFmtType {
UserFmtIMA4,
UserFmtMSADPCM,
};
enum UserFmtChannels {
enum UserFmtChannels : unsigned char {
UserFmtMono,
UserFmtStereo,
UserFmtRear,
@@ -41,7 +41,7 @@ inline ALsizei FrameSizeFromUserFmt(UserFmtChannels chans, UserFmtType type)
/* Storable formats */
enum FmtType {
enum FmtType : unsigned char {
FmtUByte = UserFmtUByte,
FmtShort = UserFmtShort,
FmtFloat = UserFmtFloat,
@@ -49,7 +49,7 @@ enum FmtType {
FmtMulaw = UserFmtMulaw,
FmtAlaw = UserFmtAlaw,
};
enum FmtChannels {
enum FmtChannels : unsigned char {
FmtMono = UserFmtMono,
FmtStereo = UserFmtStereo,
FmtRear = UserFmtRear,
+3 -3
View File
@@ -124,7 +124,7 @@ enum Channel {
/* Device formats */
enum DevFmtType {
enum DevFmtType : ALenum {
DevFmtByte = ALC_BYTE_SOFT,
DevFmtUByte = ALC_UNSIGNED_BYTE_SOFT,
DevFmtShort = ALC_SHORT_SOFT,
@@ -135,7 +135,7 @@ enum DevFmtType {
DevFmtTypeDefault = DevFmtFloat
};
enum DevFmtChannels {
enum DevFmtChannels : ALenum {
DevFmtMono = ALC_MONO_SOFT,
DevFmtStereo = ALC_STEREO_SOFT,
DevFmtQuad = ALC_QUAD_SOFT,
@@ -145,7 +145,7 @@ enum DevFmtChannels {
DevFmtAmbi3D = ALC_BFORMAT3D_SOFT,
/* Similar to 5.1, except using rear channels instead of sides */
DevFmtX51Rear = 0x80000000,
DevFmtX51Rear = 0x70000000,
DevFmtChannelsDefault = DevFmtStereo
};