diff options
author | Chris Robinson <[email protected]> | 2014-05-23 10:00:58 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2014-05-23 10:00:58 -0700 |
commit | 5ef5d218c40f36c20f1971d2fc6af101ed00d756 (patch) | |
tree | 483aefa7f02ab54dd6e82b635d7df56dada172bf | |
parent | 3fc979174764e5c2fdc17080944c090f5be350c7 (diff) |
Mark a few more functions as const
-rw-r--r-- | Alc/ALc.c | 8 | ||||
-rw-r--r-- | OpenAL32/Include/alBuffer.h | 8 | ||||
-rw-r--r-- | OpenAL32/alBuffer.c | 8 |
3 files changed, 12 insertions, 12 deletions
@@ -1332,8 +1332,8 @@ ALuint ChannelsFromDevFmt(enum DevFmtChannels chans) return 0; } -static ALboolean DecomposeDevFormat(ALenum format, enum DevFmtChannels *chans, - enum DevFmtType *type) +DECL_CONST static ALboolean DecomposeDevFormat(ALenum format, + enum DevFmtChannels *chans, enum DevFmtType *type) { static const struct { ALenum format; @@ -1379,7 +1379,7 @@ static ALboolean DecomposeDevFormat(ALenum format, enum DevFmtChannels *chans, return AL_FALSE; } -static ALCboolean IsValidALCType(ALCenum type) +DECL_CONST static ALCboolean IsValidALCType(ALCenum type) { switch(type) { @@ -1395,7 +1395,7 @@ static ALCboolean IsValidALCType(ALCenum type) return ALC_FALSE; } -static ALCboolean IsValidALCChannels(ALCenum channels) +DECL_CONST static ALCboolean IsValidALCChannels(ALCenum channels) { switch(channels) { diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index 10359d9d..12a682f4 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -34,8 +34,8 @@ enum UserFmtChannels { UserFmtX71 = AL_7POINT1_SOFT, /* (WFX order) */ }; -ALuint BytesFromUserFmt(enum UserFmtType type); -ALuint ChannelsFromUserFmt(enum UserFmtChannels chans); +ALuint BytesFromUserFmt(enum UserFmtType type) DECL_CONST; +ALuint ChannelsFromUserFmt(enum UserFmtChannels chans) DECL_CONST; inline ALuint FrameSizeFromUserFmt(enum UserFmtChannels chans, enum UserFmtType type) { return ChannelsFromUserFmt(chans) * BytesFromUserFmt(type); @@ -59,8 +59,8 @@ enum FmtChannels { }; #define MAX_INPUT_CHANNELS (8) -ALuint BytesFromFmt(enum FmtType type); -ALuint ChannelsFromFmt(enum FmtChannels chans); +ALuint BytesFromFmt(enum FmtType type) DECL_CONST; +ALuint ChannelsFromFmt(enum FmtChannels chans) DECL_CONST; inline ALuint FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type) { return ChannelsFromFmt(chans) * BytesFromFmt(type); diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index c7cfc760..2b2528f6 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -42,10 +42,10 @@ extern inline ALuint FrameSizeFromUserFmt(enum UserFmtChannels chans, enum UserF extern inline ALuint FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type); static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei frames, enum UserFmtChannels chans, enum UserFmtType type, const ALvoid *data, ALsizei align, ALboolean storesrc); -static ALboolean IsValidType(ALenum type); -static ALboolean IsValidChannels(ALenum channels); -static ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans, enum UserFmtType *type); -static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum FmtType *type); +static ALboolean IsValidType(ALenum type) DECL_CONST; +static ALboolean IsValidChannels(ALenum channels) DECL_CONST; +static ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans, enum UserFmtType *type) DECL_CONST; +static ALboolean DecomposeFormat(ALenum format, enum FmtChannels *chans, enum FmtType *type) DECL_CONST; static ALboolean SanitizeAlignment(enum UserFmtType type, ALsizei *align); |