diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/cdrcimg/cdrcimg.c | 4 | ||||
-rw-r--r-- | plugins/dfsound/externals.h | 21 | ||||
-rw-r--r-- | plugins/dfsound/freeze.c | 24 | ||||
-rw-r--r-- | plugins/dfsound/psemuxa.h | 4 | ||||
-rw-r--r-- | plugins/dfsound/stdafx.h | 4 | ||||
-rw-r--r-- | plugins/spunull/xa.h | 2 |
6 files changed, 29 insertions, 30 deletions
diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c index e327500..e04ec93 100644 --- a/plugins/cdrcimg/cdrcimg.c +++ b/plugins/cdrcimg/cdrcimg.c @@ -49,8 +49,8 @@ extern long CDR__getStatus(struct CdrStat *stat); struct CdrStat { - unsigned long Type; - unsigned long Status; + unsigned int Type; + unsigned int Status; unsigned char Time[3]; // current playing time }; diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 28dab57..2f3028e 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -58,24 +58,6 @@ // ADSR INFOS PER CHANNEL
typedef struct
{
- int AttackModeExp;
- long AttackTime;
- long DecayTime;
- long SustainLevel;
- int SustainModeExp;
- long SustainModeDec;
- long SustainTime;
- int ReleaseModeExp;
- unsigned long ReleaseVal;
- long ReleaseTime;
- long ReleaseStartTime;
- long ReleaseVol;
- long lTime;
- long lVolume;
-} ADSRInfo;
-
-typedef struct
-{
unsigned char State:2;
unsigned char AttackModeExp:1;
unsigned char SustainModeExp:1;
@@ -215,11 +197,10 @@ extern int decode_pos; extern SPUCHAN s_chan[];
extern REVERBInfo rvb;
-extern unsigned long dwNoiseVal;
extern unsigned short spuCtrl;
extern unsigned short spuStat;
extern unsigned short spuIrq;
-extern unsigned long spuAddr;
+extern unsigned int spuAddr;
extern int bSpuInit;
extern unsigned int dwNewChannel;
extern unsigned int dwChannelOn;
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c index 58a8347..8787db0 100644 --- a/plugins/dfsound/freeze.c +++ b/plugins/dfsound/freeze.c @@ -29,6 +29,24 @@ typedef struct
{
+ int AttackModeExp;
+ int AttackTime;
+ int DecayTime;
+ int SustainLevel;
+ int SustainModeExp;
+ int SustainModeDec;
+ int SustainTime;
+ int ReleaseModeExp;
+ unsigned int ReleaseVal;
+ int ReleaseTime;
+ int ReleaseStartTime;
+ int ReleaseVol;
+ int lTime;
+ int lVolume;
+} ADSRInfo;
+
+typedef struct
+{
int State;
int AttackModeExp;
int AttackRate;
@@ -40,9 +58,9 @@ typedef struct int ReleaseModeExp;
int ReleaseRate;
int EnvelopeVol;
- long lVolume;
- long lDummy1;
- long lDummy2;
+ int lVolume;
+ int lDummy1;
+ int lDummy2;
} ADSRInfoEx_orig;
typedef struct
diff --git a/plugins/dfsound/psemuxa.h b/plugins/dfsound/psemuxa.h index 84c6260..402d273 100644 --- a/plugins/dfsound/psemuxa.h +++ b/plugins/dfsound/psemuxa.h @@ -8,7 +8,7 @@ typedef struct
{
- long y0, y1;
+ int y0, y1;
} ADPCM_Decode_t;
typedef struct
@@ -21,7 +21,7 @@ typedef struct short pcm[16384];
} xa_decode_t;
-long xa_decode_sector( xa_decode_t *xdp,
+int xa_decode_sector( xa_decode_t *xdp,
unsigned char *sectorp,
int is_first_sector );
diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h index d40344f..8993bb3 100644 --- a/plugins/dfsound/stdafx.h +++ b/plugins/dfsound/stdafx.h @@ -32,9 +32,9 @@ #undef CALLBACK #define CALLBACK -#define DWORD unsigned long +#define DWORD unsigned int #define LOWORD(l) ((unsigned short)(l)) -#define HIWORD(l) ((unsigned short)(((unsigned long)(l) >> 16) & 0xFFFF)) +#define HIWORD(l) ((unsigned short)(((unsigned int)(l) >> 16) & 0xFFFF)) #ifndef INLINE #define INLINE static inline diff --git a/plugins/spunull/xa.h b/plugins/spunull/xa.h index cd38f96..6fb7bfd 100644 --- a/plugins/spunull/xa.h +++ b/plugins/spunull/xa.h @@ -5,7 +5,7 @@ typedef struct
{
- long y0, y1;
+ int y0, y1;
} ADPCM_Decode_t;
typedef struct
|