SCI: Replaced SFX_OK/SFX_ERROR by Common::Error, and got rid of sfx/sfx.h

svn-id: r40517

3 files changed, 29 insertions, 29 deletions

diff --git a/engines/sci/sfx/device/alsa-midi.cpp b/engines/sci/sfx/device/alsa-midi.cpp
index cc4037b020..0041e4a3c8 100644
--- a/engines/sci/sfx/device/alsa-midi.cpp
+++ b/engines/sci/sfx/device/alsa-midi.cpp
@@ -71,16 +71,16 @@ static void _set_tempo(void) {
 }
 
 
-static int am_subscribe_to_ports(void) {
+static Common::Error am_subscribe_to_ports(void) {
 	if ((port_out = snd_seq_connect_to(seq, port_out, port_nr, subport_nr)) < 0) {
 		fprintf(stderr, "[SFX] Could not connect to ALSA sequencer port: %s\n", snd_strerror(port_out));
-		return SFX_ERROR;
+		return Common::kUnknownError;
 	}
-	return SFX_OK;
+	return Common::kNoError;
 }
 
 
-static int aminit(midi_writer_t *self) {
+static Common::Error aminit(midi_writer_t *self) {
 	int err;
 
 	snd_midi_event_new(4096, &parser);
@@ -91,7 +91,7 @@ static int aminit(midi_writer_t *self) {
 	if (snd_seq_open(&seq, seq_name, SND_SEQ_OPEN_OUTPUT, SND_SEQ_NONBLOCK)) {
 		fprintf(stderr, "[SFX] Failed to open ALSA MIDI sequencer '%s' for output\n",
 		        seq_name);
-		return SFX_ERROR;
+		return Common::kUnknownError;
 	}
 
 	if ((port_out = snd_seq_create_simple_port(seq, "FreeSCI",
@@ -100,11 +100,11 @@ static int aminit(midi_writer_t *self) {
 	                SND_SEQ_PORT_CAP_READ,
 	                SND_SEQ_PORT_TYPE_MIDI_GENERIC)) < 0) {
 		fprintf(stderr, "[SFX] Could not create ALSA sequencer port\n");
-		return SFX_ERROR;
+		return Common::kUnknownError;
 	}
 
 	if (am_subscribe_to_ports())
-		return SFX_ERROR;
+		return Common::kUnknownError;
 
 	queue = snd_seq_alloc_queue(seq);
 	_set_tempo();
@@ -115,18 +115,18 @@ static int aminit(midi_writer_t *self) {
 		fflush(NULL);
 		fprintf(stderr, "[SFX] Error while draining: %s\n",
 		        snd_strerror(err));
-		return SFX_ERROR;
+		return Common::kUnknownError;
 	}
 
-	return SFX_OK;
+	return Common::kNoError;
 }
 
-static int amsetopt(midi_writer_t *self, char *name, char *value) {
-	return SFX_ERROR;
+static Common::Error amsetopt(midi_writer_t *self, char *name, char *value) {
+	return Common::kUnknownError;
 }
 
 
-static int amwrite(midi_writer_t *self, unsigned char *buf, int len) {
+static Common::Error amwrite(midi_writer_t *self, unsigned char *buf, int len) {
 	snd_seq_event_t evt;
 
 #if 0
@@ -162,7 +162,7 @@ static int amwrite(midi_writer_t *self, unsigned char *buf, int len) {
 #endif
 
 
-	return SFX_OK;
+	return Common::kNoError;
 }
 
 static void amdelay(midi_writer_t *self, int ticks) {
diff --git a/engines/sci/sfx/device/camd-midi.cpp b/engines/sci/sfx/device/camd-midi.cpp
index 78be387d3c..26e3db6520 100644
--- a/engines/sci/sfx/device/camd-midi.cpp
+++ b/engines/sci/sfx/device/camd-midi.cpp
@@ -58,10 +58,10 @@ static struct MidiNode *midi_node = NULL;
 			sciprintf("[SFX] CAMD driver: ");	\
 			sciprintf(m);				\
 			sciprintf("\n");			\
-			return SFX_ERROR;			\
+			return Common::kUnknownError;			\
 	}
 
-static int camd_init(midi_writer_t *self) {
+static Common::Error camd_init(midi_writer_t *self) {
 	sciprintf("[SFX] Initialising CAMD raw MIDI backend, v%s\n", SCI_CAMD_MIDI_VERSION);
 
 	CamdBase = IExec->OpenLibrary("camd.library", 36L);
@@ -82,18 +82,18 @@ static int camd_init(midi_writer_t *self) {
 
 	sciprintf("[SFX] CAMD initialisation completed\n");
 
-	return SFX_OK;
+	return Common::kNoError;
 }
 
-static int camd_set_option(midi_writer_t *self, char *name, char *value) {
-	return SFX_ERROR;
+static Common::Error camd_set_option(midi_writer_t *self, char *name, char *value) {
+	return Common::kUnknownError;
 }
 
 #define MAX_MIDI_LEN 3
 
-static int camd_write(midi_writer_t *self, unsigned char *buffer, int len) {
+static Common::Error camd_write(midi_writer_t *self, unsigned char *buffer, int len) {
 	if (len == 0)
-		return SFX_OK;
+		return Common::kNoError;
 
 	if (buffer[0] == SYSEX_PREFIX) {
 		/* Must send this as a SysEx */
@@ -117,7 +117,7 @@ static int camd_write(midi_writer_t *self, unsigned char *buffer, int len) {
 		ICamd->PutMidi(midi_link, data);
 	}
 
-	return SFX_OK;
+	return Common::kNoError;
 }
 
 static void camd_delay(midi_writer_t *self, int ticks) {
diff --git a/engines/sci/sfx/device/unixraw-midi.cpp b/engines/sci/sfx/device/unixraw-midi.cpp
index c6f393423c..bc9e8b7427 100644
--- a/engines/sci/sfx/device/unixraw-midi.cpp
+++ b/engines/sci/sfx/device/unixraw-midi.cpp
@@ -41,29 +41,29 @@ namespace Sci {
 static int fd;
 static const char *devicename = "/dev/midi";
 
-static int unixraw_init(midi_writer_t *self) {
+static Common::Error unixraw_init(midi_writer_t *self) {
 	sciprintf("[SFX] Initialising UNIX raw MIDI backend, v%s\n", SCI_UNIXRAW_MIDI_VERSION);
 
 	fd = open(devicename, O_WRONLY | O_SYNC);
 
 	if (!IS_VALID_FD(fd)) {
 		sciprintf("[SFX] Failed to open %s\n", devicename);
-		return SFX_ERROR;
+		return Common::kUnknownError;
 	}
 
-	return SFX_OK;
+	return Common::kNoError;
 }
 
-static int unixraw_set_option(midi_writer_t *self, char *name, char *value) {
-	return SFX_ERROR;
+static Common::Error unixraw_set_option(midi_writer_t *self, char *name, char *value) {
+	return Common::kUnknownError;
 }
 
-static int unixraw_write(midi_writer_t *self, unsigned char *buffer, int len) {
+static Common::Error unixraw_write(midi_writer_t *self, unsigned char *buffer, int len) {
 	if (write(fd, buffer, len) != len) {
 		sciprintf("[SFX] MIDI write error\n");
-		return SFX_ERROR;
+		return Common::kUnknownError;
 	}
-	return SFX_OK;
+	return Common::kNoError;
 }
 
 static void unixraw_delay(midi_writer_t *self, int ticks) {