Removed more dead code

svn-id: r45888

6 files changed, 0 insertions, 318 deletions

diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp
index 32e6483a07..ad1cf86431 100644
--- a/engines/sci/sfx/seq/gm.cpp
+++ b/engines/sci/sfx/seq/gm.cpp
@@ -25,7 +25,6 @@
 
 #include "common/util.h"
 
-#include "sci/sfx/sequencer.h"
 #include "sci/sfx/device.h"
 #include "sci/sfx/seq/instrument-map.h"
 
diff --git a/engines/sci/sfx/seq/sequencers.cpp b/engines/sci/sfx/seq/sequencers.cpp
deleted file mode 100644
index 98dde97652..0000000000
--- a/engines/sci/sfx/seq/sequencers.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "../sequencer.h"
-
-namespace Sci {
-
-sfx_sequencer_t *sfx_sequencers[] = {
-	NULL
-};
-
-
-sfx_sequencer_t *sfx_find_sequencer(char *name) {
-	if (!name) {
-		/* Implement default policy for your platform (if any) here, or in a function
-		** called from here (if it's non-trivial). Try to use midi_devices[0], if
-		** feasible. */
-
-		return sfx_sequencers[0]; /* default */
-	} else {
-		int n = 0;
-		while (sfx_sequencers[n]
-		        && scumm_stricmp(sfx_sequencers[n]->name, name))
-			++n;
-
-		return sfx_sequencers[n];
-	}
-}
-
-} // End of namespace Sci
diff --git a/engines/sci/sfx/sequencer.h b/engines/sci/sfx/sequencer.h
deleted file mode 100644
index 70b1c73453..0000000000
--- a/engines/sci/sfx/sequencer.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-
-#ifndef SCI_SFX_SEQUENCER_H
-#define SCI_SFX_SEQUENCER_H
-
-#include "common/scummsys.h"
-
-#include "common/error.h"
-
-namespace Sci {
-
-#define SFX_SEQ_PATCHFILE_NONE -1
-
-struct sfx_sequencer_t {
-	const char *name;    /* Sequencer name */
-	const char *version; /* Sequencer version */
-
-	int device;  /* Type of device the sequencer depends on, may be SFX_DEVICE_NONE. */
-
-	Common::Error (*set_option)(char *name, char *value);
-	/* Sets an option for the sequencing mechanism
-	** Parameters: (char *) name: The name describing what to set
-	**             (char *) value: The value to set
-	** Returns   : (int) Common::kNoError, or Common::kUnknownError if the name wasn't understood
-	*/
-
-	Common::Error (*open)(int patch_len, byte *patch, int patch2_len, byte *patch2, void *device);
-	/* Opens the sequencer for writing
-	** Parameters: (int) patch_len, patch2_len: Length of the patch data
-	**             (byte *) patch, patch2: Bulk patch data
-	**             (void *) device: A device matching the 'device' property, or NULL
-	**                              if the property is null.
-	** Returns   : (int) Common::kNoError on success, Common::kUnknownError otherwise
-	** The device should be initialized to a tick frequency of 60 Hz.
-	** 'patch' and 'patch_len' refer to the patch resource passed to open,
-	** as specified by the 'patchfile' property. 'patch' may be NULL if the
-	** resource wasn't found.
-	** For more information regarding patch resources, please refer to the
-	** FreeSCI documentation, particularly the part regarding 'patch.*' resource
-	** data.
-	*/
-
-	Common::Error (*close)();
-	/* Closes the sequencer
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	*/
-
-	Common::Error (*event)(byte command, int argc, byte *argv);
-	/* Plays a MIDI event
-	** Parameters: (byte) command: MIDI command to play
-	**             (int) argc: Number of arguments to the command
-	**             (byte *) argv: Pointer to additional arguments
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	** argv is guaranteed to point to a sufficiently large number of
-	** arguments, as indicated by 'command' and the MIDI standard.
-	** No 'running status' will be passed, 'command' will always be
-	** explicit.
-	*/
-	Common::Error (*delay)(int ticks); /* OPTIONAL -- may be NULL, but highly recommended */
-	/* Inserts a delay (delta time) into the sequencer cue
-	** Parameters: (int) ticks: Number of 60 Hz ticks to delay
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	*/
-
-	Common::Error (*reset_timer)(uint32 ts);
-	/* OPTIONAL -- may be NULL, but highly recommended in combination with delay() */
-	/* Resets the timer counter associated with the 'delay()' function
-	** Parameters: (uint32) ts: Timestamp of the base time
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	*/
-
-	Common::Error (*allstop)(); /* OPTIONAL -- may be NULL */
-	/* Stops playing everything in the sequencer queue
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	*/
-
-	Common::Error (*volume)(uint8 volume);  /* OPTIONAL -- can be NULL */
-	/* Sets the sequencer volume
-	** Parameters; (byte) volume: The volume to set, with 0 being mute and 127 full volume
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	*/
-
-	Common::Error (*reverb)(int param); /* OPTIONAL -- may be NULL */
-	/* Sets the device reverb
-	** Parameters; (int) param: The reverb to set
-	** Returns   : Common::kNoError on success, Common::kUnknownError otherwise
-	*/
-
-	int patchfile, patchfile2; /* Patch resources to pass into the call to open(),
-		       ** if present, or SFX_SEQ_PATCHFILE_NONE  */
-	uint8 playmask; /* SCI 'playflag' mask to determine which SCI song channels
-			 ** this sequencer should play */
-	/* 0x01	-- MT-32
-	** 0x02	-- Yamaha FB-01
-	** 0x04	-- CMS or Game Blaster
-	** 0x08	-- Casio MT540 or CT460
-	** 0x10	-- Tandy 3-voice
-	** 0x20 -- PC speaker
-	*/
-	uint8 play_rhythm; /* Plays the rhythm channel? */
-	int8 polyphony; /* Device polyphony (# of voices) */
-
-	int min_write_ahead_ms; /* Minimal write-ahead, in milliseconds */
-	/* Note that write-ahead is tuned automatically; this enforces a lower limit */
-
-};
-
-
-sfx_sequencer_t *sfx_find_sequencer(char *name);
-/* Finds a sequencer by name
-** Parameters: (char *) name: Name of the sequencer to look up, or NULL for default
-** Returns   : (sfx_sequencer_t *) The sequencer of matching name, or NULL
-**                                 if not found
-*/
-
-} // End of namespace Sci
-
-#endif // SCI_SFX_SEQUENCER_H
diff --git a/engines/sci/sfx/softseq.h b/engines/sci/sfx/softseq.h
deleted file mode 100644
index bf667d9806..0000000000
--- a/engines/sci/sfx/softseq.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef SCI_SFX_SOFTSEQ_H
-#define SCI_SFX_SOFTSEQ_H
-
-#include "common/error.h"
-#include "sci/sfx/sequencer.h"
-
-namespace Sci {
-
-/* Software sequencer */
-struct sfx_softseq_t {
-	const char *name;
-	const char *version;
-
-	Common::Error (*set_option)(sfx_softseq_t *self, const char *name, const char *value);
-	/* Sets an option for the sequencer
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	**             (const char *) name: Name of the option to set
-	**             (const char *) value: Value to set the option to
-	** Returns   : (int) GFX_OK on success, or GFX_ERROR if not supported
-	*/
-
-	Common::Error (*init)(sfx_softseq_t *self, byte *res_data, int res_size,
-	        byte *res2_data, int res2_size);
-	/* Initialises the sequencer
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	**             (byte *) res_data: Resource data for 'patch_nr' (see below)
-	**             (int) res_size: Number of bytes in 'res_data'
-	**             (byte *) res2_data: Resource data for 'patch2_nr' (see below)
-	**             (int) res2_size: Number of bytes in 'res2_data'
-	** Returns   : (int) Common::kNoError on success, Common::kUnknownError otherwise
-	** Note that 'res_data' is only a valid pointer for this call. If the
-	** data is needed later during execution, it should be backed up internally.
-	** If the requested resource is not available, res_data will be NULL
-	** /even if/ patch_nr is set.
-	*/
-
-	void (*exit)(sfx_softseq_t *self);
-	/* Uninitialises the sequencer and frees all used resources
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	*/
-
-	void (*setVolume)(sfx_softseq_t *self, int new_volume);
-	/* Sets the sequencer volume
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	**             (int) new_volume: A volume, between 0 (quiet) and 127 (max)
-	*/
-
-	void (*handle_command)(sfx_softseq_t *self, byte cmd, int argc, byte *argv);
-	/* Handle a MIDI command
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	**             (byte) cmd: Basic MIDI command, always includes command and channel
-	**             (int) argc: Number of additional arguments to this command
-	**             (byte *) argv: Additional arguments to 'cmd'
-	*/
-
-	void (*poll)(sfx_softseq_t *self, byte *dest, int len);
-	/* Asks the software sequencer to fill in parts of a buffer
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	**             (int) len: Number of _frames_ to write
-	** Returns   : (byte) *dest: 'len' frames must be written to this buffer
-	*/
-
-	void (*allstop)(sfx_softseq_t *self);
-	/* Stops all sound generation
-	** Parameters: (sfx_softseq_t *) self: Self reference
-	*/
-
-	void *internal; /* Internal data, may be used by sfx_softseq_t inmplementors */
-
-	int patch_nr; /* Number of the first patch file associated with this sequencer,
-		      ** or SFX_SEQ_PATCHFILE_NONE  */
-	int patch2_nr; /* Number of the second patch file associated with this sequencer,
-		      ** or SFX_SEQ_PATCHFILE_NONE  */
-	int playmask; /* playflag identifying the device emulated */
-	/* 0x01	-- MT-32
-	** 0x02	-- Yamaha FB-01
-	** 0x04	-- CMS or Game Blaster
-	** 0x08	-- Casio MT540 or CT460
-	** 0x10	-- Tandy 3-voice
-	** 0x20 -- PC speaker
-	*/
-	int play_rhythm; /* Whether the rhythm channel (9) should be played */
-	int polyphony; /* Number of voices played */
-};
-
-
-sfx_softseq_t *sfx_find_softseq(const char *name);
-/* Finds a given or default software sequencer
-** Parameters: (const char *) name: Name of the sequencer to look up, or NULL for default
-** Returns   : (sfx_softseq_t *) The requested sequencer, or NULL if not found
-*/
-
-} // End of namespace Sci
-
-#endif // SCI_SFX_SOFTSEQ_H
diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp
index 4323f2b688..fba437d306 100644
--- a/engines/sci/sfx/softseq/amiga.cpp
+++ b/engines/sci/sfx/softseq/amiga.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "sci/sfx/softseq.h"
-
 #include "sound/softsynth/emumidi.h"
 #include "sci/sfx/sci_midi.h"
 
diff --git a/engines/sci/sfx/softseq/pcjr.cpp b/engines/sci/sfx/softseq/pcjr.cpp
index 108595e8a2..acfb3c7c45 100644
--- a/engines/sci/sfx/softseq/pcjr.cpp
+++ b/engines/sci/sfx/softseq/pcjr.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "sci/sfx/softseq.h"
 #include "sci/sfx/sci_midi.h"
 #include "sci/sfx/softseq/pcjr.h"