diff options
| author | Matthew Hoops | 2009-08-30 21:04:20 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2009-08-30 21:04:20 +0000 |
| commit | 0cd85990829e0124611beaefb0da196901930872 (patch) | |
| tree | e2eb73f3f0b35d9d60367833d065dcdd8c5b5df4 /graphics/video | |
| parent | e7db409555825af6f6331294e890b677bc6e8fcf (diff) | |
| download | scummvm-rg350-0cd85990829e0124611beaefb0da196901930872.tar.gz scummvm-rg350-0cd85990829e0124611beaefb0da196901930872.tar.bz2 scummvm-rg350-0cd85990829e0124611beaefb0da196901930872.zip | |
Rename the WAVE_* constants to AVI_WAVE_* to fix compile on WinCE.
svn-id: r43839
Diffstat (limited to 'graphics/video')
| -rw-r--r-- | graphics/video/avi_player.cpp | 2 | ||||
| -rw-r--r-- | graphics/video/avi_player.h | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/graphics/video/avi_player.cpp b/graphics/video/avi_player.cpp index 2cae3904c9..3385aa6149 100644 --- a/graphics/video/avi_player.cpp +++ b/graphics/video/avi_player.cpp @@ -359,7 +359,7 @@ Codec *AVIPlayer::createCodec() { } Audio::AppendableAudioStream *AVIPlayer::createAudioStream() { - if (_wvInfo.tag == WAVE_FORMAT_PCM) + if (_wvInfo.tag == AVI_WAVE_FORMAT_PCM) return Audio::makeAppendableAudioStream(AUDIO_RATE, Audio::Mixer::FLAG_UNSIGNED|Audio::Mixer::FLAG_AUTOFREE); if (_wvInfo.tag != 0) // No sound diff --git a/graphics/video/avi_player.h b/graphics/video/avi_player.h index ba96ce8ef5..25643adc14 100644 --- a/graphics/video/avi_player.h +++ b/graphics/video/avi_player.h @@ -116,20 +116,20 @@ enum IndexFlags { }; enum WaveFormats { - WAVE_INVALIDFORMAT = 0, - WAVE_FORMAT_PCM = 1, - WAVE_FORMAT_1M08 = 1, - WAVE_FORMAT_1S08 = 2, - WAVE_FORMAT_1M16 = 4, - WAVE_FORMAT_1S16 = 8, - WAVE_FORMAT_2M08 = 16, - WAVE_FORMAT_2S08 = 32, - WAVE_FORMAT_2M16 = 64, - WAVE_FORMAT_2S16 = 128, - WAVE_FORMAT_4M08 = 256, - WAVE_FORMAT_4S08 = 512, - WAVE_FORMAT_4M16 = 1024, - WAVE_FORMAT_4S16 = 2048 + AVI_WAVE_INVALIDFORMAT = 0, + AVI_WAVE_FORMAT_PCM = 1, + AVI_WAVE_FORMAT_1M08 = 1, + AVI_WAVE_FORMAT_1S08 = 2, + AVI_WAVE_FORMAT_1M16 = 4, + AVI_WAVE_FORMAT_1S16 = 8, + AVI_WAVE_FORMAT_2M08 = 16, + AVI_WAVE_FORMAT_2S08 = 32, + AVI_WAVE_FORMAT_2M16 = 64, + AVI_WAVE_FORMAT_2S16 = 128, + AVI_WAVE_FORMAT_4M08 = 256, + AVI_WAVE_FORMAT_4S08 = 512, + AVI_WAVE_FORMAT_4M16 = 1024, + AVI_WAVE_FORMAT_4S16 = 2048 }; struct AVIHeader { |