notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: support analog controller using nubs; some refactoring
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
spu.c
diff --git
a/plugins/dfsound/spu.c
b/plugins/dfsound/spu.c
index
b71b914
..
8936e45
100644
(file)
--- a/
plugins/dfsound/spu.c
+++ b/
plugins/dfsound/spu.c
@@
-245,15
+245,16
@@
INLINE void StartSound(int ch)
StartADSR(ch);
StartREVERB(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].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;
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;
static void *MAINThread(void *arg)
{
int s_1,s_2,fa,ns;
-#if
ndef _MACOSX
+#if
!defined(_MACOSX) && !defined(__arm__)
int voldiv = iVolume;
#else
const int voldiv = 2;
int voldiv = iVolume;
#else
const int voldiv = 2;
@@
-926,7
+927,7
@@
long CALLBACK SPUinit(void)
iSPUIRQWait = 0;
lastch = -1;
iSPUIRQWait = 0;
lastch = -1;
- ReadConfigSPU(); // read user stuff
+
//
ReadConfigSPU(); // read user stuff
SetupStreams(); // prepare streaming
return 0;
SetupStreams(); // prepare streaming
return 0;
@@
-979,7
+980,7
@@
long CALLBACK SPUconfigure(void)
#ifdef _MACOSX
DoConfiguration();
#else
#ifdef _MACOSX
DoConfiguration();
#else
- StartCfgTool("CFG");
+
//
StartCfgTool("CFG");
#endif
return 0;
}
#endif
return 0;
}
@@
-990,7
+991,7
@@
void CALLBACK SPUabout(void)
#ifdef _MACOSX
DoAbout();
#else
#ifdef _MACOSX
DoAbout();
#else
- StartCfgTool("ABOUT");
+
//
StartCfgTool("ABOUT");
#endif
}
#endif
}