diff options
| author | Chris Robinson <[email protected]> | 2018-01-21 23:35:28 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-01-21 23:35:28 -0800 |
| commit | 5f3ae527c92fa1fda0ea87be9629db2c320831ec (patch) | |
| tree | 52a8a28507c408b20c1355f6446f592b8c0f5dc2 /OpenAL32/Include | |
| parent | db13af1935f969bb579fca9d79c6600d91c0fe32 (diff) | |
More cleanup for buffer loading
Don't bother with unnecessary and unused converters, and remove some
unsupported queries.
Diffstat (limited to 'OpenAL32/Include')
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 14 | ||||
| -rw-r--r-- | OpenAL32/Include/sample_cvt.h | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index 5f1e6826..e89d3c96 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -71,19 +71,17 @@ inline ALsizei FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type) typedef struct ALbuffer { ALvoid *data; - ALsizei Frequency; - ALenum Format; + ALsizei Frequency; ALbitfieldSOFT Access; - ALsizei SampleLen; + ALsizei SampleLen; enum FmtChannels FmtChannels; enum FmtType FmtType; - ALuint BytesAlloc; + ALsizei BytesAlloc; - enum UserFmtChannels OriginalChannels; - enum UserFmtType OriginalType; - ALsizei OriginalSize; - ALsizei OriginalAlign; + enum UserFmtType OriginalType; + ALsizei OriginalSize; + ALsizei OriginalAlign; ALsizei LoopStart; ALsizei LoopEnd; diff --git a/OpenAL32/Include/sample_cvt.h b/OpenAL32/Include/sample_cvt.h index 35ead20c..c041760e 100644 --- a/OpenAL32/Include/sample_cvt.h +++ b/OpenAL32/Include/sample_cvt.h @@ -7,6 +7,9 @@ extern const ALshort muLawDecompressionTable[256]; extern const ALshort aLawDecompressionTable[256]; -void ConvertData(ALvoid *dst, enum UserFmtType dstType, const ALvoid *src, enum UserFmtType srcType, ALsizei numchans, ALsizei len, ALsizei align); +void Convert_ALshort_ALima4(ALshort *dst, const ALubyte *src, ALsizei numchans, ALsizei len, + ALsizei align); +void Convert_ALshort_ALmsadpcm(ALshort *dst, const ALubyte *src, ALsizei numchans, ALsizei len, + ALsizei align); #endif /* SAMPLE_CVT_H */ |