[Scummvm-cvs-logs] SF.net SVN: scummvm:[43839] scummvm/trunk/graphics/video

[mthreepwood at users.sourceforge.net]

Revision: 43839
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43839&view=rev
Author:   mthreepwood
Date:     2009-08-30 21:04:20 +0000 (Sun, 30 Aug 2009)

Log Message:
-----------
Rename the WAVE_* constants to AVI_WAVE_* to fix compile on WinCE.

Modified Paths:
--------------
    scummvm/trunk/graphics/video/avi_player.cpp
    scummvm/trunk/graphics/video/avi_player.h

Modified: scummvm/trunk/graphics/video/avi_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_player.cpp	2009-08-30 20:58:38 UTC (rev 43838)
+++ scummvm/trunk/graphics/video/avi_player.cpp	2009-08-30 21:04:20 UTC (rev 43839)
@@ -359,7 +359,7 @@
 }
 
 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

Modified: scummvm/trunk/graphics/video/avi_player.h
===================================================================
--- scummvm/trunk/graphics/video/avi_player.h	2009-08-30 20:58:38 UTC (rev 43838)
+++ scummvm/trunk/graphics/video/avi_player.h	2009-08-30 21:04:20 UTC (rev 43839)
@@ -116,20 +116,20 @@
 };
 
 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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.