X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu.c;h=8936e45b9b255cea10d43df52186f0c45826d3f6;hp=c086c06bf1d71c290465d14f440e65aa956cfb59;hb=b00afb7734d75d4e625db0263548fa15b9aa0af7;hpb=ef79bbde537d6b9c745a7d86cb9df1d04c35590d;ds=sidebyside

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index c086c06b..8936e45b 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -245,15 +245,16 @@ INLINE void StartSound(int ch)
  StartADSR(ch);
  StartREVERB(ch);
 
- s_chan[ch].pCurr=s_chan[ch].pStart;                   // set sample start
+ // fussy timing issues - do in VoiceOn
+ //s_chan[ch].pCurr=s_chan[ch].pStart;                   // set sample start
+ //s_chan[ch].bStop=0;
+ //s_chan[ch].bOn=1;
 
  s_chan[ch].s_1=0;                                     // init mixing vars
  s_chan[ch].s_2=0;
  s_chan[ch].iSBPos=28;
 
  s_chan[ch].bNew=0;                                    // init channel flags
- s_chan[ch].bStop=0;
- s_chan[ch].bOn=1;
 
  s_chan[ch].SB[29]=0;                                  // init our interpolation helpers
  s_chan[ch].SB[30]=0;
@@ -441,7 +442,7 @@ INLINE int iGetInterpolationVal(int ch)
 static void *MAINThread(void *arg)
 {
  int s_1,s_2,fa,ns;
-#ifndef _MACOSX
+#if !defined(_MACOSX) && !defined(__arm__)
  int voldiv = iVolume;
 #else
  const int voldiv = 2;
@@ -923,10 +924,10 @@ long CALLBACK SPUinit(void)
  pMixIrq = 0;
  memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
  pSpuIrq = 0;
- iSPUIRQWait = 1;
+ iSPUIRQWait = 0;
  lastch = -1;
 
- ReadConfig();                                         // read user stuff
+ //ReadConfigSPU();                                      // read user stuff
  SetupStreams();                                       // prepare streaming
 
  return 0;
@@ -979,7 +980,7 @@ long CALLBACK SPUconfigure(void)
 #ifdef _MACOSX
  DoConfiguration();
 #else
- StartCfgTool("CFG");
+// StartCfgTool("CFG");
 #endif
  return 0;
 }
@@ -990,7 +991,7 @@ void CALLBACK SPUabout(void)
 #ifdef _MACOSX
  DoAbout();
 #else
- StartCfgTool("ABOUT");
+// StartCfgTool("ABOUT");
 #endif
 }
 
@@ -1008,6 +1009,7 @@ void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned shor
 }
 
 // COMMON PLUGIN INFO FUNCS
+/*
 char * CALLBACK PSEgetLibName(void)
 {
  return _(libraryName);
@@ -1027,3 +1029,4 @@ char * SPUgetLibInfos(void)
 {
  return _(libraryInfo);
 }
+*/