From 2ddce51a56a73acaa2bc1170d6c6ab087e1170c4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 20 Feb 2009 20:39:02 +0000
Subject: Changed more messages to warnings/errors

svn-id: r38621
---
 engines/sci/sfx/player/polled.cpp   |  9 +++++----
 engines/sci/sfx/player/realtime.cpp | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'engines/sci/sfx/player')

diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index b5b2eaf386..2274b0003a 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -25,12 +25,13 @@
 
 /* Polled player, mostly for PCM-based thingies (which _can_ poll, after all) */
 
+#include "common/file.h"
+#include "common/util.h"
+
 #include "sci/include/sfx_player.h"
 #include "sci/sfx/softseq.h"
 #include "sci/sfx/mixer.h"
 
-#include "common/file.h"
-
 static song_iterator_t *play_it;
 static int play_paused = 0;
 static sfx_softseq_t *seq;
@@ -237,7 +238,7 @@ pp_add_iterator(song_iterator_t *it, GTimeVal start_time) {
 
 static int
 pp_fade_out(void) {
-	fprintf(stderr, __FILE__": Attempt to fade out- not implemented yet\n");
+	warning(__FILE__": Attempt to fade out- not implemented yet\n");
 	return SFX_ERROR;
 }
 
@@ -246,7 +247,7 @@ pp_stop(void) {
 	song_iterator_t *it = play_it;
 
 	play_it = NULL;
-	fprintf(stderr, "[play] Now stopping it %p\n", (void *)it);
+	warning("[play] Now stopping it %p\n", (void *)it);
 	if (it)
 		songit_free(it);
 
diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp
index 5821d0b59d..ab3abc1513 100644
--- a/engines/sci/sfx/player/realtime.cpp
+++ b/engines/sci/sfx/player/realtime.cpp
@@ -27,6 +27,7 @@
 ** prays for some reasonable amount of soft real-time, but it's close
 ** enough, I guess.  */
 
+#include "common/util.h"
 #include "sci/include/sfx_player.h"
 #include "sci/sfx/sequencer.h"
 
@@ -158,7 +159,7 @@ find_patch(ResourceManager *resmgr, const char *seq_name, int patchfile) {
 	if (patchfile != SFX_SEQ_PATCHFILE_NONE) {
 		res = scir_find_resource(resmgr, sci_patch, patchfile, 0);
 		if (!res) {
-			fprintf(stderr, "[SFX] " __FILE__": patch.%03d requested by sequencer (%s), but not found\n",
+			error("[SFX] " __FILE__": patch.%03d requested by sequencer (%s), but not found\n",
 			        patchfile, seq_name);
 		}
 	}
@@ -182,7 +183,7 @@ rt_init(ResourceManager *resmgr, int expected_latency) {
 	seq = sfx_find_sequencer(NULL);
 
 	if (!seq) {
-		fprintf(stderr, "[SFX] " __FILE__": Could not find sequencer\n");
+		error("[SFX] " __FILE__": Could not find sequencer\n");
 		return SFX_ERROR;
 	}
 
@@ -199,7 +200,7 @@ rt_init(ResourceManager *resmgr, int expected_latency) {
 	              res2 ? res2->size : 0,
 	              res2 ? res2->data : NULL,
 	              seq_dev)) {
-		fprintf(stderr, "[SFX] " __FILE__": Sequencer failed to initialize\n");
+		error("[SFX] " __FILE__": Sequencer failed to initialize\n");
 		return SFX_ERROR;
 	}
 
@@ -233,7 +234,7 @@ rt_add_iterator(song_iterator_t *it, GTimeVal start_time) {
 
 static int
 rt_fade_out(void) {
-	fprintf(stderr, __FILE__": Attempt to fade out- not implemented yet\n");
+	error(__FILE__": Attempt to fade out- not implemented yet\n");
 	return SFX_ERROR;
 }
 
@@ -286,7 +287,7 @@ rt_exit(void) {
 	int retval = SFX_OK;
 
 	if (seq->close()) {
-		fprintf(stderr, "[SFX] Sequencer reported error on close\n");
+		error("[SFX] Sequencer reported error on close\n");
 		retval = SFX_ERROR;
 	}
 
-- 
cgit v1.2.3