Remove more unneeded files.

6 files changed, 1 insertions, 1533 deletions

diff --git a/Makefile b/Makefile
index 7cbb503..a972f16 100644
--- a/Makefile
+++ b/Makefile
@@ -50,12 +50,11 @@ CPP_SOURCES = source/apu.cpp source/apudebug.cpp source/c4.cpp \
               source/sdd1.cpp source/sdd1emu.cpp source/server.cpp \

               source/seta010.cpp source/seta011.cpp source/seta018.cpp \

               source/seta.cpp source/snaporig.cpp source/snapshot.cpp \

-              source/snes9x.cpp source/soundux.cpp \

+              source/soundux.cpp \

               source/spc700.cpp source/spc7110.cpp \

               source/srtc.cpp \

               source/tile.cpp source/nds/cheats3.cpp \

               source/nds/displaymodes.cpp source/nds/entry.cpp

-# spctool.cpp, sound.cpp, dsp* except dsp1.cpp, spc.cpp, spccycles.cpp have been deleted!

 SOURCES      = $(C_SOURCES) $(CPP_SOURCES)

 C_OBJECTS    = $(C_SOURCES:.c=.o)

 CPP_OBJECTS  = $(CPP_SOURCES:.cpp=.o)

diff --git a/source/snes9x.cpp b/source/snes9x.cpp
deleted file mode 100644
index fd0ee0e..0000000
--- a/source/snes9x.cpp
+++ /dev/null
@@ -1,808 +0,0 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  S-DD1 C emulator code
-  (c) Copyright 2003 Brad Jorsch with research by
-                     Andreas Naive and John Weidman
- 
-  S-RTC C emulator code
-  (c) Copyright 2001 John Weidman
-  
-  ST010 C++ emulator code
-  (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
-
-  Super FX C emulator code 
-  (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
-  SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
-
- 
-  Specific ports contains the works of other authors. See headers in
-  individual files.
- 
-  Snes9x homepage: http://www.snes9x.com
- 
-  Permission to use, copy, modify and distribute Snes9x in both binary and
-  source form, for non-commercial purposes, is hereby granted without fee,
-  providing that this license information and copyright notice appear with
-  all copies and any derived work.
- 
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event shall the authors be held liable for any damages
-  arising from the use of this software.
- 
-  Snes9x is freeware for PERSONAL USE only. Commercial users should
-  seek permission of the copyright holders first. Commercial use includes
-  charging money for Snes9x or software derived from Snes9x.
- 
-  The copyright holders request that bug fixes and improvements to the code
-  should be forwarded to them so everyone can benefit from the modifications
-  in future versions.
- 
-  Super NES and Super Nintendo Entertainment System are trademarks of
-  Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
-#include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#include "snes9x.h"
-#include "memmap.h"
-#include "display.h"
-#include "cheats.h"
-
-#ifdef DEBUGGER
-extern FILE *trace;
-#endif
-
-void S9xUsage ()
-{
-    S9xMessage (S9X_INFO, S9X_USAGE, "snes9x: S9xUsage: snes9x <options> <rom image filename>\n\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "Where <options> can be:\n");
-    
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--cycles or -h <num>       Percentage of CPU cycles to execute every scan line (default 90)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--frameskip or -f <num>    Screen update frame skip rate (default 2)\n");
-    S9xExtraUsage ();
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--hirom or -fh or -hr      Force Hi-ROM memory map, useful for hacked ROM images.\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--lorom or -fl or -lr      Force Lo-ROM memory map, useful for hacked ROM images.\n");
-    //FIXME: -old bsolete?
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--old or -o                Enable old-style SNES joypad emulation\n");
-    //FIXME: -noold obsolete?
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--noold or -no             Disbale old-style SNES joypad emulation\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--soundskip or -ss <num>   Sound CPU skip-waiting method, 0 - 3 (default 0)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--sound or -s              Enable digital sound output (default: enabled)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nosound or -ns           Disable digital sound output\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--soundquality or -r <num> Sound sample playback rate/quality, 0-7 (default 4)\n");
-
-#ifdef __sgi
-/* BS: changed the sample rate values to match the IRIX options */
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
-                          0 - off, 1 - 8192, 2 - 11025, 3 - 16000,\n\
-                          4 - 22050 (default), 5 - 32000, 6 - 44100,\n\
-                          7 - 48000\n");
-#else
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
-                          0 - off, 1 - 8192, 2 - 11025, 3 - 16500,\n\
-                          4 - 22050 (default), 5 - 29300, 6 - 36600,\n\
-                          7 - 44000\n");
-#endif
-
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--stereo                   Enable stereo sound (default: mono sound)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--mono                     Enable mono sound (default: mono sound)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--buffersize or -B         Sound playback buffer size (default auto for playback rate)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nospeedhacks or -N       Disable some internal speed ups that break a few  ROMs\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--speedhacks or -SH        Enable some internal speed ups that break a few ROMs\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--loadsnapshot or -l <filename>\n\
-                          Load saved game position snapshot file & required ROM\n\
-                          image.\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--swapjoypads or -s        Swap joypad 1 and 2 around\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--pal or -p                Fool ROM into thinking that this is a PAL SNES system\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--ntsc or -n               Fool ROM into thinking that this is a NTCS SNES system\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--interleaved or -i        ROM image is in interleaved format.\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--interleaved2 or -i2      ROM image is in interleaved 2 format\n");
-	    S9xMessage (S9X_INFO, S9X_USAGE, "\
--interleavedgd24 or -gd24 ROM image is in Game Doctor 24 Mbit format\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nohdma or -H             Disable H-DMA emulation (default: enabled)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--hdma or -NH              Enable H-DMA emulation (default: enabled)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--layering or -L           Swap some background priority levels - helps some games\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--graphicwindows           Enable graphic window effects (default: enabled)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nographicwindows or -nw  Disable graphic window effects (default: enabled)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nopatch                  Disable IPS autopatching\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nocheat                  Disable the cheat system\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--cheat                    Enables the cheat system\n");
-#ifdef DEBUGGER
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--noirq or -I              Disable processor IRQ (for debugging)\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--debug or -d              Enter debug mode once ROM has loaded\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--trace or -t              Trace CPU instructions to file (WARNING: file gets very large!)\n");
-#endif    
-
-#ifdef JOYSTICK_SUPPORT
-#ifdef __linux
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--joydevX /dev/jsY         Use joystick device /dev/jsY for emulation of gamepad X\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--joymapX 0 1 2 3 4 5 6 7  Joystick buttons which should be assigned to gamepad X - A B X Y TL TR Start and Select\n");
-#else
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--four or -4               Single standard PC joystick has four buttons\n");
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--six or -6                Single standard PC joystick has six buttons\n");
-#endif
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
--nojoy or -j              Disable joystick support\n");
-#endif    
-
-    S9xMessage (S9X_INFO, S9X_USAGE, "\
-\nROM image needs to be in Super MagiCom (*.smc), Super FamiCom (*.sfc),\n\
-*.fig, or split (*.1, *.2, or sf32527a, sf32527b, etc) format and can be\n\
-compressed with gzip or compress.\n");
-
-    exit (1);
-}
-
-#ifdef STORM
-extern int dofps;
-extern int hicolor;
-extern int secondjoy;
-extern int minimal;
-int prelude=0;
-extern int unit;
-#endif
-
-char *S9xParseArgs (char **argv, int argc)
-{
-    char *rom_filename = NULL;
-
-    for (int i = 1; i < argc; i++)
-    {
-	if (*argv[i] == '-')
-	{
-            if (strcasecmp (argv [i], "--selftest") == 0)
-	    {
-              // FIXME: Probable missuse of S9X_USAGE
-              // FIXME: Actual tests. But at least this checks for coredumps.
-              S9xMessage (S9X_INFO, S9X_USAGE, "Running selftest ...");
-              S9xMessage (S9X_INFO, S9X_USAGE, "snes9x started:\t[OK]");
-              S9xMessage (S9X_INFO, S9X_USAGE, "All tests ok.");
-              exit(0);
-	    }
-	    if (strcasecmp (argv [i], "-so") == 0 ||
-		strcasecmp (argv [i], "-sound") == 0)
-	    {
-		Settings.NextAPUEnabled = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-ns") == 0 ||
-		     strcasecmp (argv [i], "-nosound") == 0)
-	    {
-		Settings.NextAPUEnabled = FALSE;
-	    }
-	    else if (strcasecmp (argv [i], "-soundskip") == 0 ||
-		     strcasecmp (argv [i], "-sk") == 0)
-	    {
-		if (i + 1 < argc)
-		    Settings.SoundSkipMethod = atoi (argv [++i]);
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-ra") == 0 ||
-		     strcasecmp (argv [i], "-ratio") == 0)
-	    {
-		if ((i + 1) < argc)
-		{
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-h") == 0 ||
-		     strcasecmp (argv [i], "-cycles") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    int p = atoi (argv [++i]);
-		    if (p > 0 && p < 200)
-			Settings.CyclesPercentage = p;
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-nh") == 0 ||
-		     strcasecmp (argv [i], "-nohdma") == 0)
-	    {
-		Settings.DisableHDMA = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-ha") == 0 ||
-		     strcasecmp (argv [i], "-hdma") == 0)
-	    {
-		Settings.DisableHDMA = FALSE;
-	    }
-	    else if (strcasecmp (argv [i], "-n") == 0 ||
-		     strcasecmp (argv [i], "-nospeedhacks") == 0)
-	    {
-		Settings.ShutdownMaster = FALSE;
-	    }
-	    else if (strcasecmp (argv [i], "-sh") == 0 ||
-		     strcasecmp (argv [i], "-speedhacks") == 0)
-	    {
-		Settings.ShutdownMaster = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-p") == 0 ||
-		     strcasecmp (argv [i], "-pal") == 0)
-	    {
-		Settings.ForcePAL = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-n") == 0 ||
-		     strcasecmp (argv [i], "-ntsc") == 0)
-	    {
-		Settings.ForceNTSC = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-f") == 0 ||
-		     strcasecmp (argv [i], "-frameskip") == 0)
-	    {
-		if (i + 1 < argc)
-		    Settings.SkipFrames = atoi (argv [++i]) + 1;
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-fh") == 0 ||
-		     strcasecmp (argv [i], "-hr") == 0 ||
-		     strcasecmp (argv [i], "-hirom") == 0)
-		Settings.ForceHiROM = TRUE;
-	    else if (strcasecmp (argv [i], "-fl") == 0 ||
-		     strcasecmp (argv [i], "-lr") == 0 ||
-		     strcasecmp (argv [i], "-lorom") == 0)
-		Settings.ForceLoROM = TRUE;
-	    else if (strcasecmp (argv [i], "-hd") == 0 ||
-		     strcasecmp (argv [i], "-header") == 0 ||
-		     strcasecmp (argv [i], "-he") == 0)
-	    {
-		Settings.ForceHeader = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-nhd") == 0 ||
-		     strcasecmp (argv [i], "-noheader") == 0)
-	    {
-		Settings.ForceNoHeader = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-bs") == 0)
-	    {
-		Settings.BS = TRUE;
-	    }
-#ifdef DEBUGGER
-	    else if (strcasecmp (argv [i], "-d") == 0 ||
-		     strcasecmp (argv [i], "-debug") == 0)
-	    {
-		CPU.Flags |= DEBUG_MODE_FLAG;
-	    }
-	    else if (strcasecmp (argv [i], "-t") == 0 ||
-		     strcasecmp (argv [i], "-trace") == 0)
-	    {
-		trace = fopen ("trace.log", "wb");
-		CPU.Flags |= TRACE_FLAG;
-	    }
-#endif
-	    else if (strcasecmp (argv [i], "-L") == 0 ||
-		     strcasecmp (argv [i], "-layering") == 0)
-		Settings.BGLayering = TRUE;
-	    else if (strcasecmp (argv [i], "-nl") == 0 ||
-		     strcasecmp (argv [i], "-nolayering") == 0)
-		Settings.BGLayering = FALSE;
-	    else if (strcasecmp (argv [i], "-O") == 0 ||
-		     strcasecmp (argv [i], "-tileredraw") == 0)
-	    {
-	    }
-	    else if (strcasecmp (argv [i], "-no") == 0 ||
-		     strcasecmp (argv [i], "-lineredraw") == 0)
-	    {
-	    }
-	    else if (strcasecmp (argv [i], "-tr") == 0 ||
-		     strcasecmp (argv [i], "-transparency") == 0)
-	    {
-		Settings.ForceTransparency = TRUE;
-		Settings.ForceNoTransparency = FALSE;
-	    }
-	    else if (strcasecmp (argv [i], "-nt") == 0 ||
-		     strcasecmp (argv [i], "-notransparency") == 0)
-	    {
-		Settings.ForceNoTransparency = TRUE;
-		Settings.ForceTransparency = FALSE;
-	    }
-	    else if (strcasecmp (argv [i], "-hi") == 0 ||   
-		     strcasecmp (argv [i], "-hires") == 0)
-	    {
-		Settings.SupportHiRes = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-16") == 0 ||
-		     strcasecmp (argv [i], "-sixteen") == 0)
-	    {
-		Settings.SixteenBit = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-displayframerate") == 0 ||
-		     strcasecmp (argv [i], "-dfr") == 0)
-	    {
-		Settings.DisplayFrameRate = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-s") == 0 ||
-		     strcasecmp (argv [i], "-swapjoypads") == 0 ||
-		     strcasecmp (argv [i], "-sw") == 0)
-		Settings.SwapJoypads = TRUE;
-	    else if (strcasecmp (argv [i], "-i") == 0 ||
-		     strcasecmp (argv [i], "-interleaved") == 0)
-		Settings.ForceInterleaved = TRUE;
-	    else if (strcasecmp (argv [i], "-i2") == 0 ||
-		     strcasecmp (argv [i], "-interleaved2") == 0)
-		Settings.ForceInterleaved2=TRUE;
-	    else if (strcasecmp (argv [i], "-gd24") == 0 ||
-		     strcasecmp (argv [i], "-interleavedgd24") == 0)
-		Settings.ForceInterleaveGD24 = TRUE;
-	    else if (strcasecmp (argv [i], "-ni") == 0 ||
-		     strcasecmp (argv [i], "-nointerleave") == 0)
-		Settings.ForceNotInterleaved = TRUE;
-	    else if (strcasecmp (argv [i], "-noirq") == 0)
-		Settings.DisableIRQ = TRUE;
-	    else if (strcasecmp (argv [i], "-nw") == 0 ||
-		     strcasecmp (argv [i], "-nowindows") == 0)
-	    {
-		Settings.DisableGraphicWindows = TRUE;
-	    }
-		else if (strcasecmp (argv [i], "-nopatch") == 0)
-		{
-			Settings.NoPatch=TRUE;
-		}
-		else if (strcasecmp (argv [i], "-nocheat") == 0)
-		{
-			Settings.ApplyCheats=FALSE;
-		}
-		else if (strcasecmp (argv [i], "-cheat") == 0)
-		{
-			Settings.ApplyCheats=TRUE;
-		}
-	    else if (strcasecmp (argv [i], "-windows") == 0)
-	    {
-		Settings.DisableGraphicWindows = FALSE;
-	    }
-            else if (strcasecmp (argv [i], "-aidoshm") == 0)
-            {
-                if (i + 1 < argc)
-                {
-                    Settings.AIDOShmId = atoi (argv [++i]);
-                    fprintf(stderr, "Snes9X running in AIDO mode. shmid: %d\n",
-                            Settings.AIDOShmId);
-                } else
-                    S9xUsage ();
-            }
-#ifdef DEBUG_MAXCOUNT
-            else if (strcasecmp (argv [i], "-maxcount") == 0)
-            {
-                if (i + 1 < argc)
-                {
-                    Settings.MaxCount = atol (argv [++i]);
-                    fprintf(stderr, "Running for a maximum of %d loops.\n",
-                            Settings.MaxCount);
-                } else
-                    S9xUsage ();
-            }
-#endif
-	    else if (strcasecmp (argv [i], "-im7") == 0)
-	    {
-		Settings.Mode7Interpolate = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-gg") == 0 ||
-		     strcasecmp (argv [i], "-gamegenie") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    uint32 address;
-		    uint8 byte;
-		    const char *error;
-		    if ((error = S9xGameGenieToRaw (argv [++i], address, byte)) == NULL)
-			S9xAddCheat (TRUE, FALSE, address, byte);
-		    else
-			S9xMessage (S9X_ERROR, S9X_GAME_GENIE_CODE_ERROR,
-				    error);
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-ar") == 0 ||
-		     strcasecmp (argv [i], "-actionreplay") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    uint32 address;
-		    uint8 byte;
-		    const char *error;
-		    if ((error = S9xProActionReplayToRaw (argv [++i], address, byte)) == NULL)
-			S9xAddCheat (TRUE, FALSE, address, byte);
-		    else
-			S9xMessage (S9X_ERROR, S9X_ACTION_REPLY_CODE_ERROR,
-				    error);
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-gf") == 0 ||
-		     strcasecmp (argv [i], "-goldfinger") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    uint32 address;
-		    uint8 bytes [3];
-		    bool8 sram;
-		    uint8 num_bytes;
-		    const char *error;
-		    if ((error = S9xGoldFingerToRaw (argv [++i], address, sram,
-						     num_bytes, bytes)) == NULL)
-		    {
-			for (int c = 0; c < num_bytes; c++)
-			    S9xAddCheat (TRUE, FALSE, address + c, bytes [c]);
-		    }
-		    else
-			S9xMessage (S9X_ERROR, S9X_GOLD_FINGER_CODE_ERROR,
-				    error);
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv[i], "-ft") == 0 ||
-		     strcasecmp (argv [i], "-frametime") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    double ft;
-		    if (sscanf (argv [++i], "%lf", &ft) == 1)
-		    {
-#ifdef __WIN32__
-			Settings.FrameTimePAL = (int32) (ft * 1000);
-			Settings.FrameTimeNTSC = (int32) (ft * 1000);
-#else
-			Settings.FrameTimePAL = (int32) ft;
-			Settings.FrameTimeNTSC = (int32) ft;
-#endif
-
-		    }
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-e") == 0 ||
-		     strcasecmp (argv [i], "-echo") == 0)
-		Settings.DisableSoundEcho = FALSE;
-	    else if (strcasecmp (argv [i], "-ne") == 0 ||
-		     strcasecmp (argv [i], "-noecho") == 0)
-		Settings.DisableSoundEcho = TRUE;
-	    else if (strcasecmp (argv [i], "-r") == 0 ||
-		     strcasecmp (argv [i], "-soundquality") == 0 ||
-		     strcasecmp (argv [i], "-sq") == 0)
-	    {
-		if (i + 1 < argc)
-		    Settings.SoundPlaybackRate = atoi (argv [++i]) & 7;
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-stereo") == 0 ||
-		     strcasecmp (argv [i], "-st") == 0)
-	    {
-		Settings.Stereo = TRUE;
-		Settings.APUEnabled = TRUE;
-		Settings.NextAPUEnabled = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-mono") == 0)
-	    {
-		Settings.Stereo = FALSE;
-		Settings.NextAPUEnabled = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-envx") == 0 ||
-		     strcasecmp (argv [i], "-ex") == 0)
-	    {
-		Settings.SoundEnvelopeHeightReading = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-nosamplecaching") == 0 ||
-		     strcasecmp (argv [i], "-nsc") == 0 ||
-		     strcasecmp (argv [i], "-nc") == 0)
-	    {
-		Settings.DisableSampleCaching = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-nomastervolume") == 0 ||
-		     strcasecmp (argv [i], "-nmv") == 0)
-	    {
-		Settings.DisableMasterVolume = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-soundsync") == 0 ||
-		     strcasecmp (argv [i], "-sy") == 0)
-	    {
-		Settings.SoundSync = TRUE;
-		Settings.SoundEnvelopeHeightReading = TRUE;
-		Settings.InterpolatedSound = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-soundsync2") == 0 ||
-		     strcasecmp (argv [i], "-sy2") == 0)
-	    {
-		Settings.SoundSync = 2;
-		Settings.SoundEnvelopeHeightReading = TRUE;
-		Settings.InterpolatedSound = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-interpolatedsound") == 0 ||
-		     strcasecmp (argv [i], "-is") == 0)
-	    {
-		Settings.InterpolatedSound = TRUE;
-	    }
-#ifdef USE_THREADS
-	    else if (strcasecmp (argv [i], "-threadsound") == 0 ||
-		     strcasecmp (argv [i], "-ts") == 0)
-	    {
-		Settings.ThreadSound = TRUE;
-	    }
-#endif
-	    else if (strcasecmp (argv [i], "-alt") == 0 ||
-		     strcasecmp (argv [i], "-altsampledecode") == 0)
-	    {
-		Settings.AltSampleDecode = 1;
-	    }
-	    else if (strcasecmp (argv [i], "-fix") == 0)
-	    {
-		Settings.FixFrequency = 1;
-	    }
-	    else if (strcasecmp (argv [i], "-nosuperfx") == 0 ||
-		     strcasecmp (argv [i], "-nosfx") == 0)
-		Settings.ForceNoSuperFX = TRUE;
-	    else if (strcasecmp (argv [i], "-superfx") == 0 ||
-		     strcasecmp (argv [i], "-sfx") == 0)
-		Settings.ForceSuperFX = TRUE;
-	    else if (strcasecmp (argv [i], "-dsp1") == 0)
-		Settings.ForceDSP1 = TRUE;
-	    else if (strcasecmp (argv [i], "-nodsp1") == 0)
-		Settings.ForceNoDSP1 = TRUE;
-	    else if (strcasecmp (argv [i], "-nomultiplayer5") == 0 ||
-		     strcasecmp (argv [i], "-nmp") == 0)
-		Settings.MultiPlayer5 = FALSE;
-	    else if (strcasecmp (argv [i], "-multiplayer5") == 0 ||
-		     strcasecmp (argv [i], "-mp") == 0)
-	    {
-		Settings.MultiPlayer5 = TRUE;
-		Settings.ControllerOption = SNES_MULTIPLAYER5;
-	    }
-	    else if (strcasecmp (argv [i], "-mouse") == 0 ||
-		     strcasecmp (argv [i], "-mo") == 0)
-	    {
-		Settings.ControllerOption = SNES_MOUSE_SWAPPED;
-		Settings.Mouse = TRUE;
-	    }
-	    else if (strcasecmp (argv [i], "-nomouse") == 0 ||
-		     strcasecmp (argv [i], "-nm") == 0)
-	    {
-		Settings.Mouse = FALSE;
-	    }
-	    else if (strcasecmp (argv [i], "-superscope") == 0 ||
-		     strcasecmp (argv [i], "-ss") == 0)
-	    {
-		Settings.SuperScope = TRUE;
-		Settings.ControllerOption = SNES_SUPERSCOPE;
-	    }
-	    else if (strcasecmp (argv [i], "-nosuperscope") == 0 ||
-		     strcasecmp (argv [i], "-nss") == 0)
-	    {
-		Settings.SuperScope = FALSE;
-	    }
-#ifdef NETPLAY_SUPPORT
-	    else if (strcasecmp (argv [i], "-port") == 0 ||
-		     strcasecmp (argv [i], "-po") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    Settings.NetPlay = TRUE;
-		    Settings.Port = -atoi (argv [++i]);
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-server") == 0 ||
-		     strcasecmp (argv [i], "-srv") == 0)
-	    {
-		if (i + 1 < argc)
-		{
-		    Settings.NetPlay = TRUE;
-		    strncpy (Settings.ServerName, argv [++i], 127);
-		    Settings.ServerName [127] = 0;
-		}
-		else
-		    S9xUsage ();
-	    }
-	    else if (strcasecmp (argv [i], "-net") == 0)
-	    {
-		Settings.NetPlay = TRUE;
-	    }
-#endif
-#ifdef STORM
-            else if (strcasecmp(argv[i],"-nosecondjoy")==0){secondjoy=0;}
-            else if (strcasecmp(argv[i],"-showfps")==0){dofps=1;}
-            else if (strcasecmp(argv[i],"-hicolor")==0){hicolor=1;}
-            else if (strcasecmp(argv[i],"-minimal")==0){minimal=1;printf("Keyboard with exception of ESC switched off!\n");}
-            else if (strcasecmp(argv[i],"-ahiunit")==0)
-            {
-             if (i+1<argc)
-             {
-              fprintf(stderr,"AHI Unit set to: Unit %i\n",atoi(argv[++i]));
-              unit=atoi(argv[++i]);
-             }
-            }
-#endif
-
-	    else
-		S9xParseArg (argv, i, argc);
-	}
-	else
-	    rom_filename = argv [i];
-    }
-
-    return (rom_filename);
-}
-
-#if 0
-//static char* fgets(char *buffer, int num, FILE *stream)
-char* fgets(char *buffer, int num, FILE *stream)
-{
-	int m;
-	char *s;
-
-//    printf("In fgets\n");
-
-	if(num <= 0)
-		return (NULL);
-
-	num--;
-	m= fread(buffer, 1, num, stream);
-	*(buffer +m) = '\0';
-
-//    printf("fread= %s\n", buffer);
-
-    if(m == 0)
-      return (NULL);
-
-	s = strchr(buffer, '\n');
-	
-	if(m < num)						//at the end of file
-	{
-		if(s == NULL)
-			return (buffer);
-
-		*(++s)= '\0';				//string include '\n'
-		m -= s - buffer;
-		fseek(stream, -m, SEEK_CUR);//fix fread pointer
-		return (buffer);
-	}
-	else
-	{
-		if(s)
-		{
-			*(++s)= '\0';				//string include '\n'
-			m -= s - buffer;
-			fseek(stream, -m, SEEK_CUR);//fix fread pointer
-		}
-
-		return (buffer);
-	}
-}
-#endif
-
-void S9xParseCheatsFile (const char *rom_filename)
-{
-    FILE *f;
-    char dir [_MAX_DIR];
-    char drive [_MAX_DRIVE];
-    char name [_MAX_FNAME];
-    char ext [_MAX_EXT];
-    char fname [_MAX_PATH];
-    char buf [80];
-    uint32 address;
-    uint8 byte;
-    uint8 bytes [3];
-    bool8 sram;
-    uint8 num_bytes;
-    const char *error;
-    char *p;
-
-    _splitpath (rom_filename, drive, dir, name, ext);
-    _makepath (fname, drive, dir, name, "pat");
-
-    if ((f = fopen(fname, "r")) != NULL)
-    {
-        while(fgets(buf, 80, f) != NULL)
-        {
-	    if ((p = strrchr (buf, '\n')) != NULL) 
-		*p = '\0';
-	    if (((error = S9xGameGenieToRaw (buf, address, byte)) == NULL) ||
-		((error = S9xProActionReplayToRaw (buf, address, byte)) == NULL))
-	    {
-		S9xAddCheat (TRUE, FALSE, address, byte);
-	    }
-	    else
-	    if ((error = S9xGoldFingerToRaw (buf, address, sram,
-					     num_bytes, bytes)) == NULL)
-	    {
-		for (int c = 0; c < num_bytes; c++)
-		    S9xAddCheat (TRUE, FALSE, address + c, bytes [c]);
-	    }
-	    else
-		S9xMessage (S9X_ERROR, S9X_GAME_GENIE_CODE_ERROR, error);
-        }
-        fclose(f);
-    }
-}
-
diff --git a/source/sound.cpp b/source/sound.cpp
deleted file mode 100644
index e69a1fb..0000000
--- a/source/sound.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  S-DD1 C emulator code
-  (c) Copyright 2003 Brad Jorsch with research by
-                     Andreas Naive and John Weidman
- 
-  S-RTC C emulator code
-  (c) Copyright 2001 John Weidman
-  
-  ST010 C++ emulator code
-  (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
-
-  Super FX C emulator code 
-  (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
-  SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
-
- 
-  Specific ports contains the works of other authors. See headers in
-  individual files.
- 
-  Snes9x homepage: http://www.snes9x.com
- 
-  Permission to use, copy, modify and distribute Snes9x in both binary and
-  source form, for non-commercial purposes, is hereby granted without fee,
-  providing that this license information and copyright notice appear with
-  all copies and any derived work.
- 
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event shall the authors be held liable for any damages
-  arising from the use of this software.
- 
-  Snes9x is freeware for PERSONAL USE only. Commercial users should
-  seek permission of the copyright holders first. Commercial use includes
-  charging money for Snes9x or software derived from Snes9x.
- 
-  The copyright holders request that bug fixes and improvements to the code
-  should be forwarded to them so everyone can benefit from the modifications
-  in future versions.
- 
-  Super NES and Super Nintendo Entertainment System are trademarks of
-  Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
-#include <devices/ahi.h>
-#include <exec/exec.h>
-#include <proto/ahi.h>
-#include <proto/dos.h>
-#include <proto/exec.h>
-#include <clib/ahippc_protos.h>
-#include <stdio.h>
-
-#define EQ ==
-#define MINBUFFLEN 10000
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "snes9x.h"
-#include "soundux.h"
-
-extern SoundStatus so;
-
-extern int AudioOpen(unsigned long freq, unsigned long bufsize, unsigned long bitrate, unsigned long stereo);
-extern void AudioClose(void);
-
-extern int OpenPrelude(ULONG Type, ULONG DefaultFreq, ULONG MinBuffSize);
-extern void ClosePrelude(void);
-
-extern int SoundSignal;
-unsigned long DoubleBuffer;
-//extern struct AHISampleInfo Sample0;
-//extern struct AHISampleInfo Sample1;
-//extern unsigned long BufferSize;
-
-struct Library    *AHIPPCBase;
-struct Library    *AHIBase;
-struct MsgPort    *AHImp=NULL;
-struct AHIRequest *AHIio=NULL;
-BYTE               AHIDevice=-1;
-
-struct AHIData *AHIData;
-
-unsigned long Frequency = 0;
-//unsigned long BufferSize = 0;
-unsigned long BitRate = 0;
-unsigned long Stereo = 0;
-//unsigned long AHIError = 9;
-
-BYTE InternSignal=-1;
-
-int mixsamples;
-extern int prelude;
-
-#define REALSIZE (BitRate*Stereo)
-
-struct AHIAudioModeRequester *req=NULL;
-struct AHIAudioCtrl *actrl=NULL;
-
-ULONG BufferLen=NULL;
-
-
-/* this really should be dynamically allocated... */
-#undef  MAX_BUFFER_SIZE
-#define MAX_BUFFER_SIZE 65536
-#define MIN_BUFFER_SIZE 65536
-
-#define MODE_MONO       0
-#define MODE_STEREO     1
-
-#define QUAL_8BIT       8
-#define QUAL_16BIT      16
-
-
-int test=0;
-int test2=0;
-
-int AudioOpen(unsigned long freq, unsigned long minbufsize, unsigned long bitrate, unsigned long stereo)
-{
-        ULONG Type;
-
-        Frequency = freq;
-
-    so.playback_rate = Frequency;
-    
-    if(stereo) so.stereo = TRUE;
-    else so.stereo = FALSE;
-
-        switch(bitrate)
-        {
-                case 8:
-            so.sixteen_bit = FALSE;
-                        BitRate=1;
-                        if(stereo)
-                        {
-                                Stereo=2;
-                                Type = AHIST_S8S;
-                        }
-                        else
-                        {
-                                Stereo=1;
-                                Type = AHIST_M8S;
-                        }
-
-                break;
-
-                default:        //defaulting to 16bit, because it means it won't crash atleast
-                case QUAL_16BIT:
-            so.sixteen_bit = TRUE;
-                        BitRate=2;
-                        if(stereo)
-                        {
-                                Stereo=2;
-                                Type = AHIST_S16S;
-                        }
-                        else
-                        {
-                                Stereo=1;
-                                Type = AHIST_M16S;
-                        }
-                break;
-        }
-
-    if(prelude) prelude = OpenPrelude(Type, freq, minbufsize);
-    
-    
-    if(prelude) return 1; else printf("Defaulting to AHI...\n");
-
-    /* only 1 channel right? */
-    /* NOTE: The buffersize will not always be what you requested
-     * it finds the minimun AHI requires and then rounds it up to
-     * nearest 32 bytes.  Check AHIData->BufferSize or Samples[n].something_Length
-     */
-    if(AHIData = OpenAHI(1, Type, AHI_INVALID_ID, AHI_DEFAULT_FREQ, 0, minbufsize))
-    {
-        printf("AHI opened\n");
-        printf("BuffSize %d\n", AHIData->BufferSize);
-    }
-    else
-    {
-        printf("AHI failed to open: %d\n", AHIData);
-        return 0;
-    }
-    
-    so.buffer_size = AHIData->BufferSize; // in bytes
-        if (so.buffer_size > MAX_BUFFER_SIZE) so.buffer_size = MAX_BUFFER_SIZE;
-
-    /* Lots of useful fields in the AHIData struct, have a look */
-    AHIBase = AHIData->AHIBase;
-    actrl = AHIData->AudioCtrl;
-    Frequency = AHIData->MixingFreq;
-
-        printf("signal %ld\n", AHIData->SoundFuncSignal);
-
-        Wait(AHIData->SoundFuncSignal);
-
-        /* I don't think it should start playing until there is something
-         * In the buffer, however to set off the SoundFunc it should
-         * probably go through the buffer at least once, just silently.
-         */
-        AHI_SetFreq(0, Frequency, actrl, AHISF_IMM);
-
-        Wait(AHIData->SoundFuncSignal);
-
-        AHI_SetVol(0, 0x10000, 0x8000, actrl, AHISF_IMM);
-
-        mixsamples=AHIData->BufferSamples;
-
-        SoundSignal = AHIData->SoundFuncSignal;
-    
-    return 1;
-}
-
-void AudioClose( void )
-{
-    if(prelude) ClosePrelude();
-        else ;//CloseAHI(AHIData);
-}
-
-
-#include <wbstartup.h>
-
-extern int main(int argc, char **argv);
-
-void wbmain(struct WBStartup * argmsg)
-{
- char argv[1][]={"WarpSNES"};
- int argc=1;
- main(argc,(char **)argv);
-}
-
-
diff --git a/source/spc.cpp b/source/spc.cpp
deleted file mode 100644
index c12c831..0000000
--- a/source/spc.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  S-DD1 C emulator code
-  (c) Copyright 2003 Brad Jorsch with research by
-                     Andreas Naive and John Weidman
- 
-  S-RTC C emulator code
-  (c) Copyright 2001 John Weidman
-  
-  ST010 C++ emulator code
-  (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
-
-  Super FX C emulator code 
-  (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
-  SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
-
- 
-  Specific ports contains the works of other authors. See headers in
-  individual files.
- 
-  Snes9x homepage: http://www.snes9x.com
- 
-  Permission to use, copy, modify and distribute Snes9x in both binary and
-  source form, for non-commercial purposes, is hereby granted without fee,
-  providing that this license information and copyright notice appear with
-  all copies and any derived work.
- 
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event shall the authors be held liable for any damages
-  arising from the use of this software.
- 
-  Snes9x is freeware for PERSONAL USE only. Commercial users should
-  seek permission of the copyright holders first. Commercial use includes
-  charging money for Snes9x or software derived from Snes9x.
- 
-  The copyright holders request that bug fixes and improvements to the code
-  should be forwarded to them so everyone can benefit from the modifications
-  in future versions.
- 
-  Super NES and Super Nintendo Entertainment System are trademarks of
-  Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
-void S9xSPCDump (const char *filename)
-{
-    FILE *fs;
-
-    bool8 read_only = FALSE;
-    char def [PATH_MAX];
-    char title [PATH_MAX];
-    char drive [_MAX_DRIVE];
-    char dir [_MAX_DIR];
-    char ext [_MAX_EXT];
-
-    S9xSetSoundMute (TRUE);
-
-#if 0
-    _splitpath (Memory.ROMFilename, drive, dir, def, ext);
-    strcat (def, ".spc");
-    sprintf (title, "%s SPC filename",
-		read_only ? "Select load" : "Choose save");
-    const char *filename;
-
-    filename = S9xSelectFilename (def, ".", "spc", title);
-#endif
-
-    fs = fopen (filename, "wb");
-    fputs ("SNES-SPC700 Sound File Data 0.10", fs);
-    fseek (fs, 37, SEEK_SET);
-    fwrite (&APURegisters.PC, 2, 1, fs);
-
-    fputc (APURegisters.YA.B.A, fs);
-    fputc (APURegisters.X, fs);
-    fputc (APURegisters.YA.B.Y, fs);
-    fputc (APURegisters.P, fs);
-    fputc (APURegisters.S - 0x100, fs); // ???
-    fseek (fs, 256, SEEK_SET);
-
-    fwrite (IAPU.RAM, 1, 65536, fs);
-
-    fwrite (APU.DSP, 1, 192, fs);
-    fwrite (APU.ExtraRAM, 1, 64, fs);
-
-    fclose (fs);
-
-    S9xSetSoundMute (FALSE);
-}
-
diff --git a/source/spccycles.cpp b/source/spccycles.cpp
deleted file mode 100644
index 3cb572e..0000000
--- a/source/spccycles.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  S-DD1 C emulator code
-  (c) Copyright 2003 Brad Jorsch with research by
-                     Andreas Naive and John Weidman
- 
-  S-RTC C emulator code
-  (c) Copyright 2001 John Weidman
-  
-  ST010 C++ emulator code
-  (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
-
-  Super FX C emulator code 
-  (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
-  SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
-
- 
-  Specific ports contains the works of other authors. See headers in
-  individual files.
- 
-  Snes9x homepage: http://www.snes9x.com
- 
-  Permission to use, copy, modify and distribute Snes9x in both binary and
-  source form, for non-commercial purposes, is hereby granted without fee,
-  providing that this license information and copyright notice appear with
-  all copies and any derived work.
- 
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event shall the authors be held liable for any damages
-  arising from the use of this software.
- 
-  Snes9x is freeware for PERSONAL USE only. Commercial users should
-  seek permission of the copyright holders first. Commercial use includes
-  charging money for Snes9x or software derived from Snes9x.
- 
-  The copyright holders request that bug fixes and improvements to the code
-  should be forwarded to them so everyone can benefit from the modifications
-  in future versions.
- 
-  Super NES and Super Nintendo Entertainment System are trademarks of
-  Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
-
-static uint8 spc700cycles [256] = 
-{
-    /*        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, */
-    /* 00 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 4, 6, 8, 
-    /* 10 */  2, 8, 4, 5, 4, 5, 5, 6, 5, 5, 6, 5, 2, 2, 4, 6, 
-    /* 20 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 4, 5, 4, 
-    /* 30 */  2, 8, 4, 5, 4, 5, 5, 6, 5, 5, 6, 5, 2, 2, 3, 8, 
-    /* 40 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 4, 4, 5, 4, 6, 6, 
-    /* 50 */  2, 8, 4, 5, 4, 5, 5, 6, 5, 5, 4, 5, 2, 2, 4, 3, 
-    /* 60 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 4, 4, 5, 4, 5, 5, 
-    /* 70 */  2, 8, 4, 5, 4, 5, 5, 6, 5, 5, 5, 5, 2, 2, 3, 6, 
-    /* 80 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 2, 4, 5, 
-    /* 90 */  2, 8, 4, 5, 4, 5, 5, 6, 5, 5, 5, 5, 2, 2,12, 5, 
-    /* a0 */  3, 8, 4, 5, 3, 4, 3, 6, 2, 6, 4, 4, 5, 2, 4, 4, 
-    /* b0 */  2, 8, 4, 5, 4, 5, 5, 6, 5, 5, 5, 5, 2, 2, 3, 4, 
-    /* c0 */  3, 8, 4, 5, 4, 5, 4, 7, 2, 5, 6, 4, 5, 2, 4, 9, 
-    /* d0 */  2, 8, 4, 5, 5, 6, 6, 7, 4, 5, 4, 5, 2, 2, 6, 3, 
-    /* e0 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 4, 5, 3, 4, 3, 4, 3, 
-    /* f0 */  2, 8, 4, 5, 4, 5, 5, 6, 3, 4, 5, 4, 2, 2, 4, 3
-};
-
diff --git a/source/spctool.cpp b/source/spctool.cpp
deleted file mode 100644
index 011498c..0000000
--- a/source/spctool.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
-  Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- 
-  (c) Copyright 1996 - 2002 Gary Henderson (gary.henderson@ntlworld.com) and
-                            Jerremy Koot (jkoot@snes9x.com)
-
-  (c) Copyright 2001 - 2004 John Weidman (jweidman@slip.net)
-
-  (c) Copyright 2002 - 2004 Brad Jorsch (anomie@users.sourceforge.net),
-                            funkyass (funkyass@spam.shaw.ca),
-                            Joel Yliluoma (http://iki.fi/bisqwit/)
-                            Kris Bleakley (codeviolation@hotmail.com),
-                            Matthew Kendora,
-                            Nach (n-a-c-h@users.sourceforge.net),
-                            Peter Bortas (peter@bortas.org) and
-                            zones (kasumitokoduck@yahoo.com)
-
-  C4 x86 assembler and some C emulation code
-  (c) Copyright 2000 - 2003 zsKnight (zsknight@zsnes.com),
-                            _Demo_ (_demo_@zsnes.com), and Nach
-
-  C4 C++ code
-  (c) Copyright 2003 Brad Jorsch
-
-  DSP-1 emulator code
-  (c) Copyright 1998 - 2004 Ivar (ivar@snes9x.com), _Demo_, Gary Henderson,
-                            John Weidman, neviksti (neviksti@hotmail.com),
-                            Kris Bleakley, Andreas Naive
-
-  DSP-2 emulator code
-  (c) Copyright 2003 Kris Bleakley, John Weidman, neviksti, Matthew Kendora, and
-                     Lord Nightmare (lord_nightmare@users.sourceforge.net
-
-  OBC1 emulator code
-  (c) Copyright 2001 - 2004 zsKnight, pagefault (pagefault@zsnes.com) and
-                            Kris Bleakley
-  Ported from x86 assembler to C by sanmaiwashi
-
-  SPC7110 and RTC C++ emulator code
-  (c) Copyright 2002 Matthew Kendora with research by
-                     zsKnight, John Weidman, and Dark Force
-
-  S-DD1 C emulator code
-  (c) Copyright 2003 Brad Jorsch with research by
-                     Andreas Naive and John Weidman
- 
-  S-RTC C emulator code
-  (c) Copyright 2001 John Weidman
-  
-  ST010 C++ emulator code
-  (c) Copyright 2003 Feather, Kris Bleakley, John Weidman and Matthew Kendora
-
-  Super FX x86 assembler emulator code 
-  (c) Copyright 1998 - 2003 zsKnight, _Demo_, and pagefault 
-
-  Super FX C emulator code 
-  (c) Copyright 1997 - 1999 Ivar, Gary Henderson and John Weidman
-
-
-  SH assembler code partly based on x86 assembler code
-  (c) Copyright 2002 - 2004 Marcus Comstedt (marcus@mc.pp.se) 
-
- 
-  Specific ports contains the works of other authors. See headers in
-  individual files.
- 
-  Snes9x homepage: http://www.snes9x.com
- 
-  Permission to use, copy, modify and distribute Snes9x in both binary and
-  source form, for non-commercial purposes, is hereby granted without fee,
-  providing that this license information and copyright notice appear with
-  all copies and any derived work.
- 
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event shall the authors be held liable for any damages
-  arising from the use of this software.
- 
-  Snes9x is freeware for PERSONAL USE only. Commercial users should
-  seek permission of the copyright holders first. Commercial use includes
-  charging money for Snes9x or software derived from Snes9x.
- 
-  The copyright holders request that bug fixes and improvements to the code
-  should be forwarded to them so everyone can benefit from the modifications
-  in future versions.
- 
-  Super NES and Super Nintendo Entertainment System are trademarks of
-  Nintendo Co., Limited and its subsidiary companies.
-*******************************************************************************/
-#include "snes9x.h"
-#include "spctool/dsp.h"
-#include "spctool/spc700.h"
-#include "spctool/soundmod.h"
-#include "apu.h"
-
-bool8 S9xOpenSoundDevice (int, bool8, int);
-
-void S9xSetPlaybackRate (uint32 rate)
-{
-    DOpt		SmpOpt;
-    
-    SmpOpt.Smp8bit=false;
-    SmpOpt.SmpMono=false;
-    SmpOpt.IntType=IntC;
-    SmpOpt.OldBRE=false;
-    SmpOpt.MixRout=1;
-    SetSPUOpt (rate, SmpOpt);
-
-//    so.playback_rate = playback_rate;
-//    so.err_rate = (uint32) (SNES_SCANLINE_TIME * FIXED_POINT / (1.0 / (double) so.playback_rate));
- }
-
-bool8 S9xSetSoundMute (bool8 mute)
-{
-    return (TRUE);
-}
-
-START_EXTERN_C
-bool8 S9xInitSound (int mode, bool8 stereo, int buffer_size)
-{
-    if (!(mode & 7))
-	return (TRUE);
-
-    S9xSetSoundMute (TRUE);
-    if (!S9xOpenSoundDevice (mode, stereo, buffer_size))
-    {
-	S9xMessage (S9X_ERROR, S9X_SOUND_DEVICE_OPEN_FAILED,
-		    "Sound device open failed");
-	return (FALSE);
-    }
-    return (TRUE);
-}
-
-void TraceSPC (unsigned char *PC, unsigned short YA, unsigned char X,
-	       SPCFlags PS, unsigned char *SP)
-{
-    APURegisters.YA.W = YA;
-    APURegisters.X = X;
-    APURegisters.S = SP - IAPU.RAM;
-    IAPU.PC = PC;
-    IAPU._Carry = PS.C;
-    IAPU._Zero = !PS.Z | (PS.N << 7);
-    IAPU._Overflow = PS.V;
-    APURegisters.P = *(uint8 *) &PS;
-    S9xTraceAPU ();
-}
-
-bool8 S9xInitAPU ()
-{
-    void		*SPCBase;               //Base pointer and aligned pointer to SPC RAM
-    
-    SPCBase=malloc(131072);                  //Allocate memory for SPC RAM
-	memset(SPCBase, 0, 131072);
-
-    IAPU.RAM=(uint8 *) InitSPU(SPCBase);                 //Initialize SPU w/ ptr to SPC RAM (Call only once)
-
-    S9xSetPlaybackRate (22050);
-    ResetSPU(20);                            //Reset SPU with pre-amp level of 30
-//    _SetSPCDbg(TraceSPC);                   //Install debug handler
-   return (TRUE);
-}
-
-void S9xResetAPU ()
-{
-    ResetSPU(20);
-    IAPU.RAM [0xf1] = 0x80;
-    _FixSPC (0xffc0, 0, 0, 0, 0, 0xff);
-//    FixDSP ();
-}
-
-extern "C" void EDSP (uint8 *, int32);
-
-void S9xMixSamplesO (uint8 *buffer, int sample_count, int byte_offset)
-{
-//    _EmuDSP (buffer + byte_offset, sample_count / 2);
-
-    EDSP (buffer + byte_offset, sample_count / 2);
-#if 0
-for (int i = 0; i < 32; i++)
-printf ("%02x,", *(buffer + byte_offset + i));
-printf ("\n");
-#endif
-}
-END_EXTERN_C
-
-void S9xFixSoundAfterSnapshotLoad ()
-{
-}
-
-void S9xSetSoundControl (int)
-{
-}
-
-#ifdef DEBUGGER
-START_EXTERN_C
-void S9xDeinitAPU ()
-{
-}
-
-END_EXTERN_C
-#endif
-