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: add missing sample copying for thread mode
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
externals.h
diff --git
a/plugins/dfsound/externals.h
b/plugins/dfsound/externals.h
index
e85c191
..
ac0960f
100644
(file)
--- a/
plugins/dfsound/externals.h
+++ b/
plugins/dfsound/externals.h
@@
-253,13
+253,17
@@
typedef struct
\r
sample_buf sb[MAXCHAN];
\r
int interpolation;
\r
\r
sample_buf sb[MAXCHAN];
\r
int interpolation;
\r
- sample_buf sb_thread[MAXCHAN];
\r
+
\r
+#if P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)
\r
+ sample_buf * sb_thread;
\r
+ sample_buf sb_thread_[MAXCHAN];
\r
+#endif
\r
} SPUInfo;
\r
\r
#define regAreaGet(offset) \
\r
} SPUInfo;
\r
\r
#define regAreaGet(offset) \
\r
- spu.regArea[((offset) - 0xc00)
>>
1]
\r
+ spu.regArea[((offset) - 0xc00)
>>
1]
\r
#define regAreaGetCh(ch, offset) \
\r
#define regAreaGetCh(ch, offset) \
\r
- spu.regArea[((
ch<<4)|(offset))>>
1]
\r
+ spu.regArea[((
(ch) << 4) | (offset)) >>
1]
\r
\r
///////////////////////////////////////////////////////////
\r
// SPU.C globals
\r
\r
///////////////////////////////////////////////////////////
\r
// SPU.C globals
\r
@@
-269,15
+273,15
@@
typedef struct
\r
extern SPUInfo spu;
\r
\r
\r
extern SPUInfo spu;
\r
\r
-void do_samples(unsigned int cycles_to, int
do_sync
);
\r
+void do_samples(unsigned int cycles_to, int
force_no_thread
);
\r
void schedule_next_irq(void);
\r
void check_irq_io(unsigned int addr);
\r
void do_irq_io(int cycles_after);
\r
\r
void schedule_next_irq(void);
\r
void check_irq_io(unsigned int addr);
\r
void do_irq_io(int cycles_after);
\r
\r
-#define do_samples_if_needed(c,
sync
, samples) \
\r
+#define do_samples_if_needed(c,
no_thread
, samples) \
\r
do { \
\r
do { \
\r
- if (
sync
|| (int)((c) - spu.cycles_played) >= (samples) * 768) \
\r
- do_samples(c,
sync
); \
\r
+ if (
(no_thread)
|| (int)((c) - spu.cycles_played) >= (samples) * 768) \
\r
+ do_samples(c,
no_thread
); \
\r
} while (0)
\r
\r
#endif
\r
} while (0)
\r
\r
#endif
\r