From adb69a5a39bb58a0ac6866b64ede228692a80488 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 24 Aug 2011 09:38:46 -0400
Subject: AUDIO: Rename Vag to XA

Vag is really an XA container, and one that we do not have a decoder for (nor need)
---
 engines/sword2/music.cpp | 4 ++--
 engines/sword2/sound.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/sword2')

diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 63116e954a..1e52cc29a7 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -39,7 +39,7 @@
 #include "audio/decoders/vorbis.h"
 #include "audio/decoders/flac.h"
 #include "audio/decoders/wave.h"
-#include "audio/decoders/vag.h"
+#include "audio/decoders/xa.h"
 #include "audio/rate.h"
 
 #include "sword2/sword2.h"
@@ -267,7 +267,7 @@ Audio::AudioStream *makePSXCLUStream(Common::File *file, int size) {
 
 	byte *buffer = (byte *)malloc(size);
 	file->read(buffer, size);
-	return Audio::makeVagStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES));
+	return Audio::makeXAStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES));
 }
 
 // ----------------------------------------------------------------------------
diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index 19e244e61c..d9260cc2d5 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -47,7 +47,7 @@
 #include "sword2/sound.h"
 
 #include "audio/decoders/wave.h"
-#include "audio/decoders/vag.h"
+#include "audio/decoders/xa.h"
 
 #define Debug_Printf _vm->_debugger->DebugPrintf
 
@@ -234,7 +234,7 @@ void Sound::playMovieSound(int32 res, int type) {
 		Audio::RewindableAudioStream *input = 0;
 
 		if (Sword2Engine::isPsx()) {
-			input = Audio::makeVagStream(stream);
+			input = Audio::makeXAStream(stream);
 		} else {
 			input = Audio::makeWAVStream(stream, DisposeAfterUse::YES);
 		}
@@ -361,7 +361,7 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo
 	Audio::RewindableAudioStream *input = 0;
 
 	if (Sword2Engine::isPsx())
-		input = Audio::makeVagStream(stream);
+		input = Audio::makeXAStream(stream);
 	else
 		input = Audio::makeWAVStream(stream, DisposeAfterUse::YES);
 
-- 
cgit v1.2.3