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
spu: refactor adsr (simplify code)
[pcsx_rearmed.git]
/
frontend
/
plugin.c
diff --git
a/frontend/plugin.c
b/frontend/plugin.c
index
c11a1f0
..
33efbf0
100644
(file)
--- a/
frontend/plugin.c
+++ b/
frontend/plugin.c
@@
-43,15
+43,21
@@
extern void SPUplayCDDAchannel(short *, int);
/* PAD */
static long PADreadPort1(PadDataS *pad)
{
/* PAD */
static long PADreadPort1(PadDataS *pad)
{
- pad->controllerType = PSE_PAD_TYPE_STANDARD;
- pad->buttonStatus = ~keystate;
+ pad->controllerType = in_type;
+ pad->buttonStatus = ~in_keystate;
+ if (in_type == PSE_PAD_TYPE_ANALOGPAD) {
+ pad->leftJoyX = in_a1[0];
+ pad->leftJoyY = in_a1[1];
+ pad->rightJoyX = in_a2[0];
+ pad->rightJoyY = in_a2[1];
+ }
return 0;
}
static long PADreadPort2(PadDataS *pad)
{
pad->controllerType = PSE_PAD_TYPE_STANDARD;
return 0;
}
static long PADreadPort2(PadDataS *pad)
{
pad->controllerType = PSE_PAD_TYPE_STANDARD;
- pad->buttonStatus = ~keystate >> 16;
+ pad->buttonStatus = ~
in_
keystate >> 16;
return 0;
}
return 0;
}