From 4c3421288d2d74396579f35b25a7b78e14afa7f4 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 22 Jul 2012 22:29:07 +0200
Subject: WINTERMUTE: Add an audio-debug-channel and reduce the use of
 warning()

---
 engines/wintermute/base/sound/base_sound_buffer.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'engines/wintermute/base/sound')

diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index b8c19c2985..e1dba2120d 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -33,6 +33,7 @@
 #include "engines/wintermute/base/sound/base_sound_buffer.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/utils/utils.h"
+#include "engines/wintermute/wintermute.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 #include "audio/decoders/vorbis.h"
@@ -95,13 +96,7 @@ void BaseSoundBuffer::setStreaming(bool Streamed, uint32 NumBlocks, uint32 Block
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseSoundBuffer::loadFromFile(const char *filename, bool forceReload) {
-	warning("BSoundBuffer::LoadFromFile(%s,%d)", filename, forceReload);
-#if 0
-	if (_stream) {
-		BASS_StreamFree(_stream);
-		_stream = NULL;
-	}
-#endif
+	debugC(kWinterMuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename, forceReload);
 
 	// Load a file, but avoid having the File-manager handle the disposal of it.
 	_file = _gameRef->_fileManager->openFile(filename, true, false);
@@ -123,11 +118,11 @@ bool BaseSoundBuffer::loadFromFile(const char *filename, bool forceReload) {
 				_file = new Common::SeekableSubReadStream(_file, 0, waveSize);
 				_stream = Audio::makeRawStream(_file, waveRate, waveFlags, DisposeAfterUse::YES);
 			} else {
-				warning("BSoundBuffer::LoadFromFile - WAVE not supported yet for %s with type %d", filename, waveType);
+				error("BSoundBuffer::LoadFromFile - WAVE not supported yet for %s with type %d", filename, waveType);
 			}
 		}
 	} else {
-		warning("BSoundBuffer::LoadFromFile - Unknown filetype for %s", filename);
+		error("BSoundBuffer::LoadFromFile - Unknown filetype for %s", filename);
 	}
 	if (!_stream) {
 		return STATUS_FAILED;
-- 
cgit v1.2.3