aboutsummaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authornotaz2011-09-21 04:03:48 +0300
committernotaz2011-09-21 04:03:48 +0300
commit174c454a98a71475b72958c9f76293af7d6fb502 (patch)
tree5b5d00d1e167f7957126cc9a754056add7801c3f /frontend
parent587fa7de9b496a0b7fa1d52d393733886602ca83 (diff)
downloadpcsx_rearmed-174c454a98a71475b72958c9f76293af7d6fb502.tar.gz
pcsx_rearmed-174c454a98a71475b72958c9f76293af7d6fb502.tar.bz2
pcsx_rearmed-174c454a98a71475b72958c9f76293af7d6fb502.zip
spu: get rid of pCurr -1, pass right chans to silent handler
pCurr -1 would work weird with savestates and could screw things up in general..
Diffstat (limited to 'frontend')
-rw-r--r--frontend/plugin_lib.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index b60c1cd..57b9422 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -81,8 +81,9 @@ static void print_cpu_usage(void)
// draw 192x8 status of 24 sound channels
static __attribute__((noinline)) void draw_active_chans(void)
{
- extern void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out); // hack
- int live_chans, fmod_chans, noise_chans;
+ extern void spu_get_debug_info(int *chans_out, int *run_chans,
+ int *fmod_chans_out, int *noise_chans_out); // hack
+ int live_chans, run_chans, fmod_chans, noise_chans;
static const unsigned short colors[2] = { 0x1fe3, 0x0700 };
unsigned short *dest = (unsigned short *)pl_vout_buf +
@@ -93,11 +94,11 @@ static __attribute__((noinline)) void draw_active_chans(void)
if (pl_vout_bpp != 16)
return;
- spu_get_debug_info(&live_chans, &fmod_chans, &noise_chans);
+ spu_get_debug_info(&live_chans, &run_chans, &fmod_chans, &noise_chans);
for (c = 0; c < 24; c++) {
d = dest + c * 8;
- p = !(live_chans & (1<<c)) ? 0 :
+ p = !(live_chans & (1<<c)) ? (run_chans & (1<<c) ? 0x01c0 : 0) :
(fmod_chans & (1<<c)) ? 0xf000 :
(noise_chans & (1<<c)) ? 0x001f :
colors[c & 1];