notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2 from sergiobenrocha2/master
[picodrive.git]
/
pico
/
sound
/
ym2612.c
diff --git
a/pico/sound/ym2612.c
b/pico/sound/ym2612.c
index
4b64fb4
..
f7a073f
100644
(file)
--- a/
pico/sound/ym2612.c
+++ b/
pico/sound/ym2612.c
@@
-139,6
+139,10
@@
void memset32(int *dest, int c, int count);
#define INLINE static __inline
\r
#endif
\r
\r
#define INLINE static __inline
\r
#endif
\r
\r
+#ifndef STRICTINLINE
\r
+#define STRICTINLINE static inline
\r
+#endif
\r
+
\r
#ifndef M_PI
\r
#define M_PI 3.14159265358979323846
\r
#endif
\r
#ifndef M_PI
\r
#define M_PI 3.14159265358979323846
\r
#endif
\r
@@
-561,7
+565,6
@@
INLINE void FM_KEYON(int c , int s )
SLOT->key = 1;
\r
SLOT->phase = 0; /* restart Phase Generator */
\r
SLOT->state = EG_ATT; /* phase -> Attack */
\r
SLOT->key = 1;
\r
SLOT->phase = 0; /* restart Phase Generator */
\r
SLOT->state = EG_ATT; /* phase -> Attack */
\r
- SLOT->volume = MAX_ATT_INDEX; /* fix Ecco 2 splash sound */
\r
ym2612.slot_mask |= (1<<s) << (c*4);
\r
}
\r
}
\r
ym2612.slot_mask |= (1<<s) << (c*4);
\r
}
\r
}
\r
@@
-743,7
+746,7
@@
INLINE int advance_lfo(int lfo_ampm, UINT32 lfo_cnt_old, UINT32 lfo_cnt)
#define EG_INC_VAL() \
\r
((1 << ((pack >> ((eg_cnt>>shift)&7)*3)&7)) >> 1)
\r
\r
#define EG_INC_VAL() \
\r
((1 << ((pack >> ((eg_cnt>>shift)&7)*3)&7)) >> 1)
\r
\r
-INLINE UINT32 update_eg_phase(FM_SLOT *SLOT, UINT32 eg_cnt)
\r
+
STRICT
INLINE UINT32 update_eg_phase(FM_SLOT *SLOT, UINT32 eg_cnt)
\r
{
\r
INT32 volume = SLOT->volume;
\r
\r
{
\r
INT32 volume = SLOT->volume;
\r
\r
@@
-1202,7
+1205,7
@@
static int chan_render(int *buffer, int length, int c, UINT32 flags) // flags: s
}
\r
\r
/* update phase increment and envelope generator */
\r
}
\r
\r
/* update phase increment and envelope generator */
\r
-INLINE void refresh_fc_eg_slot(FM_SLOT *SLOT, int fc, int kc)
\r
+
STRICT
INLINE void refresh_fc_eg_slot(FM_SLOT *SLOT, int fc, int kc)
\r
{
\r
int ksr, fdt;
\r
\r
{
\r
int ksr, fdt;
\r
\r