git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@53446 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 6 insertions, 112 deletions

diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 25689bd4..88a7dc8f 100644
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -9,7 +9,7 @@ libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libDFSound.la
 
-libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c
+libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c
 
 libDFSound_la_CFLAGS =
 libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm
diff --git a/plugins/dfsound/Makefile.in b/plugins/dfsound/Makefile.in
index b9891f67..173a0137 100644
--- a/plugins/dfsound/Makefile.in
+++ b/plugins/dfsound/Makefile.in
@@ -69,7 +69,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libDFSound_la_LIBADD =
-am__libDFSound_la_SOURCES_DIST = spu.c cfg.c dma.c freeze.c psemu.c \
+am__libDFSound_la_SOURCES_DIST = spu.c cfg.c dma.c freeze.c \
 	registers.c alsa.c oss.c pulseaudio.c sdl.c nullsnd.c
 @SOUND_ALSA_TRUE@am__objects_1 = libDFSound_la-alsa.lo
 @SOUND_OSS_TRUE@am__objects_2 = libDFSound_la-oss.lo
@@ -78,9 +78,8 @@ am__libDFSound_la_SOURCES_DIST = spu.c cfg.c dma.c freeze.c psemu.c \
 @SOUND_NULL_TRUE@am__objects_5 = libDFSound_la-nullsnd.lo
 am_libDFSound_la_OBJECTS = libDFSound_la-spu.lo libDFSound_la-cfg.lo \
 	libDFSound_la-dma.lo libDFSound_la-freeze.lo \
-	libDFSound_la-psemu.lo libDFSound_la-registers.lo \
-	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5)
+	libDFSound_la-registers.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5)
 libDFSound_la_OBJECTS = $(am_libDFSound_la_OBJECTS)
 libDFSound_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libDFSound_la_CFLAGS) \
@@ -269,7 +268,7 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-I../../include
 
 lib_LTLIBRARIES = libDFSound.la
-libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c psemu.c registers.c \
+libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c \
 	$(am__append_1) $(am__append_4) $(am__append_6) \
 	$(am__append_9) $(am__append_12)
 libDFSound_la_CFLAGS = $(am__append_2) $(am__append_5) $(am__append_7) \
@@ -387,7 +386,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-freeze.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-nullsnd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-oss.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-psemu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-pulseaudio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-registers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-sdl.Plo@am__quote@
@@ -443,13 +441,6 @@ libDFSound_la-freeze.lo: freeze.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-freeze.lo `test -f 'freeze.c' || echo '$(srcdir)/'`freeze.c
 
-libDFSound_la-psemu.lo: psemu.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-psemu.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-psemu.Tpo -c -o libDFSound_la-psemu.lo `test -f 'psemu.c' || echo '$(srcdir)/'`psemu.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-psemu.Tpo $(DEPDIR)/libDFSound_la-psemu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='psemu.c' object='libDFSound_la-psemu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-psemu.lo `test -f 'psemu.c' || echo '$(srcdir)/'`psemu.c
-
 libDFSound_la-registers.lo: registers.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-registers.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-registers.Tpo -c -o libDFSound_la-registers.lo `test -f 'registers.c' || echo '$(srcdir)/'`registers.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-registers.Tpo $(DEPDIR)/libDFSound_la-registers.Plo
diff --git a/plugins/dfsound/psemu.c b/plugins/dfsound/psemu.c
deleted file mode 100644
index c75a022c..00000000
--- a/plugins/dfsound/psemu.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************

-                          psemu.c  -  description

-                             -------------------

-    begin                : Wed May 15 2002

-    copyright            : (C) 2002 by Pete Bernert

-    email                : BlackDove@addcom.de

- ***************************************************************************/

-/***************************************************************************

- *                                                                         *

- *   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. See also the license.txt file for *

- *   additional informations.                                              *

- *                                                                         *

- ***************************************************************************/

-

-#include "stdafx.h"

-

-#define _IN_PSEMU

-

-#include "externals.h"

-#include "regs.h"

-#include "dma.h"

-

-////////////////////////////////////////////////////////////////////////

-// OLD, SOMEWHAT (BUT NOT MUCH) SUPPORTED PSEMUPRO FUNCS

-////////////////////////////////////////////////////////////////////////

-

-unsigned short CALLBACK SPUgetOne(unsigned long val)

-{

- if(spuAddr!=0xffffffff)

-  {

-   return SPUreadDMA();

-  }

- if(val>=512*1024) val=512*1024-1;

- return spuMem[val>>1];

-}

-

-void CALLBACK SPUputOne(unsigned long val,unsigned short data)

-{

- if(spuAddr!=0xffffffff)

-  {

-   SPUwriteDMA(data);

-   return;

-  }

- if(val>=512*1024) val=512*1024-1;

- spuMem[val>>1] = data;

-}

-

-void CALLBACK SPUplaySample(unsigned char ch)

-{

-}

-

-void CALLBACK SPUsetAddr(unsigned char ch, unsigned short waddr)

-{

- s_chan[ch].pStart=spuMemC+((unsigned long) waddr<<3);

-}

-

-void CALLBACK SPUsetPitch(unsigned char ch, unsigned short pitch)

-{

- SetPitch(ch,pitch);

-}

-

-void CALLBACK SPUsetVolumeL(unsigned char ch, short vol)

-{

- SetVolumeR(ch,vol);

-}

-

-void CALLBACK SPUsetVolumeR(unsigned char ch, short vol)

-{

- SetVolumeL(ch,vol);

-}               

-

-void CALLBACK SPUstartChannels1(unsigned short channels)

-{

- SoundOn(0,16,channels);

-}

-

-void CALLBACK SPUstartChannels2(unsigned short channels)

-{

- SoundOn(16,24,channels);

-}

-

-void CALLBACK SPUstopChannels1(unsigned short channels)

-{

- SoundOff(0,16,channels);

-}

-

-void CALLBACK SPUstopChannels2(unsigned short channels)

-{

- SoundOff(16,24,channels);

-}

-

-void CALLBACK SPUplaySector(unsigned long mode, unsigned char * p)

-{

-}

-

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index efc32b1a..de57429d 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -924,6 +924,7 @@ long CALLBACK SPUinit(void)
  memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
  pSpuIrq = 0;
  iSPUIRQWait = 1;
+ lastch = -1;
 
  ReadConfig();                                         // read user stuff
  SetupStreams();                                       // prepare streaming