diff options
| author | Max Horn | 2006-04-29 22:33:31 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-29 22:33:31 +0000 |
| commit | 27307acd7c6f9f9083bdcad38ba54f18d4f080b7 (patch) | |
| tree | fd7360382a19b07dcca9b711080b3f6c8f64fd38 /sound/audiostream.h | |
| parent | ac0ae13bee890b78442788abe6b87e514c9928a0 (diff) | |
| download | scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.gz scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.bz2 scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.zip | |
Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
Diffstat (limited to 'sound/audiostream.h')
| -rw-r--r-- | sound/audiostream.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/audiostream.h b/sound/audiostream.h index 88d5339f5a..078c8506c5 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -28,6 +28,8 @@ #include "common/scummsys.h" +namespace Audio { + /** * Generic input stream for the resampling code. */ @@ -116,11 +118,10 @@ AudioStream *makeLinearInputStream(int rate, byte flags, const byte *ptr, uint32 // us to go with the macro approach. So far this is // the only template function that MSVC6 seemed to // compile incorrectly. Knock on wood. -#define READSAMPLE(is16Bit, isUnsigned, ptr) \ - ((is16Bit ? READ_BE_UINT16(ptr) : (*ptr << 8)) ^ (isUnsigned ? 0x8000 : 0)) - #define READ_ENDIAN_SAMPLE(is16Bit, isUnsigned, ptr, isLE) \ ((is16Bit ? (isLE ? READ_LE_UINT16(ptr) : READ_BE_UINT16(ptr)) : (*ptr << 8)) ^ (isUnsigned ? 0x8000 : 0)) +} // End of namespace Audio + #endif |