revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.

svn-id: r38696

3 files changed, 8 insertions, 8 deletions

diff --git a/engines/sci/sfx/softseq/SN76496.cpp b/engines/sci/sfx/softseq/SN76496.cpp
index b341fcaa64..f128be2d00 100644
--- a/engines/sci/sfx/softseq/SN76496.cpp
+++ b/engines/sci/sfx/softseq/SN76496.cpp
@@ -66,7 +66,7 @@ SN76496_event(sfx_softseq_t *self, byte command, int argc, byte *argv) {
 	int i;
 	int chan = -1;
 #if 0
-	error("Note [%02x : %02x %02x]\n", command,  argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
+	fprintf(stderr, "Note [%02x : %02x %02x]\n", command,  argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
 #endif
 	if ((command & 0xe0) == 0x80) {
 		int chan_nr = command & 0xf;
@@ -98,7 +98,7 @@ SN76496_event(sfx_softseq_t *self, byte command, int argc, byte *argv) {
 		}
 	}
 #if 0
-	error(" --> %d [%04x], {%d,%d,%d}@%d\n", chan,
+	fprintf(stderr, " --> %d [%04x], {%d,%d,%d}@%d\n", chan,
 	        channels_assigned, chan_nrs[0], chan_nrs[1], chan_nrs[2], channel_assigner);
 #endif
 
@@ -127,7 +127,7 @@ SN76496_event(sfx_softseq_t *self, byte command, int argc, byte *argv) {
 
 	default:
 #if DEBUG
-		error("[SFX:PCM-PC] Unused MIDI command %02x %02x %02x\n", command, argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
+		fprintf(stderr, "[SFX:PCM-PC] Unused MIDI command %02x %02x %02x\n", command, argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
 #endif
 		break; /* ignore */
 	}
diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp
index 29f600a634..4ca05412d7 100644
--- a/engines/sci/sfx/softseq/opl2.cpp
+++ b/engines/sci/sfx/softseq/opl2.cpp
@@ -475,12 +475,12 @@ opl2_poll(sfx_softseq_t *self, byte *dest, int count) {
 	gint16 *ptr = buffer;
 
 	if (!ready) {
-		error("synth_mixer(): !ready \n");
+		fprintf(stderr, "synth_mixer(): !ready \n");
 		exit(1);
 	}
 
 	if (!buffer) {
-		error("synth_mixer(): !buffer \n");
+		fprintf(stderr, "synth_mixer(): !buffer \n");
 		exit(1);
 	}
 
@@ -539,7 +539,7 @@ opl2_init(sfx_softseq_t *self, byte *data_ptr, int data_length, byte *data2_ptr,
 
 	if (!(ym3812_L = OPLCreate(OPL_TYPE_YM3812, OPL_INTERNAL_FREQ, SAMPLE_RATE)) ||
 	        !(ym3812_R = OPLCreate(OPL_TYPE_YM3812, OPL_INTERNAL_FREQ, SAMPLE_RATE))) {
-		sciprintf("[sfx:seq:opl2] Failure: Emulator init failed");
+		sciprintf("[sfx:seq:opl2] Failure: Emulator init failed!\n");
 		return SFX_ERROR;
 	}
 
diff --git a/engines/sci/sfx/softseq/pcspeaker.cpp b/engines/sci/sfx/softseq/pcspeaker.cpp
index c03724524d..3f4bb0f332 100644
--- a/engines/sci/sfx/softseq/pcspeaker.cpp
+++ b/engines/sci/sfx/softseq/pcspeaker.cpp
@@ -58,7 +58,7 @@ sps_exit(sfx_softseq_t *self) {
 static void
 sps_event(sfx_softseq_t *self, byte command, int argc, byte *argv) {
 #if 0
-	error("Note [%02x : %02x %02x]\n", command,  argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
+	fprintf(stderr, "Note [%02x : %02x %02x]\n", command,  argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
 #endif
 
 	switch (command & 0xf0) {
@@ -84,7 +84,7 @@ sps_event(sfx_softseq_t *self, byte command, int argc, byte *argv) {
 
 	default:
 #if DEBUG
-		error("[SFX:PCM-PC] Unused MIDI command %02x %02x %02x\n", command, argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
+		fprintf(stderr, "[SFX:PCM-PC] Unused MIDI command %02x %02x %02x\n", command, argc ? argv[0] : 0, (argc > 1) ? argv[1] : 0);
 #endif
 		break; /* ignore */
 	}