Switch to C99 types (retaining compat with old compilers)

Seeing the "mpd_" prefix _everywhere_ is mind-numbing as the
mind needs to retrain itself to skip over the first 4 tokens of
a type to get to its meaning.  So avoid having extra characters
on my terminal to make it easier to follow code at 2:30 am in
the morning.

Please report any new issues you may come across on Free
toolchains.  I realize how difficult it can be to build/maintain
cross-compiling toolchains and I have no intention of forcing
people to upgrade their toolchains to build mpd.

Tested with gcc 2.95.4 and and gcc 4.3.1 on x86-32.
This commit is contained in:
Eric Wong
2008-09-29 13:29:33 +02:00
committed by Max Kellermann
parent a4019f7d21
commit 0352766dca
20 changed files with 437 additions and 72 deletions
+2 -2
View File
@@ -316,7 +316,7 @@ static int aac_stream_decode(struct decoder * mpd_decoder,
unsigned int sampleCount;
char *sampleBuffer;
size_t sampleBufferLen;
mpd_uint16 bitRate = 0;
uint16_t bitRate = 0;
AacBuffer b;
int initialized = 0;
@@ -453,7 +453,7 @@ static int aac_decode(struct decoder * mpd_decoder, char *path)
/*float * seekTable;
long seekTableEnd = -1;
int seekPositionFound = 0; */
mpd_uint16 bitRate = 0;
uint16_t bitRate = 0;
AacBuffer b;
InputStream inStream;
int initialized = 0;
+5 -5
View File
@@ -65,7 +65,7 @@ static unsigned long prng(unsigned long state)
return (state * 0x0019660dL + 0x3c6ef35fL) & 0xffffffffL;
}
static mpd_sint16 audio_linear_dither(unsigned int bits, mad_fixed_t sample,
static int16_t audio_linear_dither(unsigned int bits, mad_fixed_t sample,
struct audio_dither *dither)
{
unsigned int scalebits;
@@ -107,15 +107,15 @@ static mpd_sint16 audio_linear_dither(unsigned int bits, mad_fixed_t sample,
dither->error[0] = sample - output;
return (mpd_sint16)(output >> scalebits);
return (int16_t)(output >> scalebits);
}
static unsigned dither_buffer(mpd_sint16 *dest0, const struct mad_synth *synth,
static unsigned dither_buffer(int16_t *dest0, const struct mad_synth *synth,
struct audio_dither *dither,
unsigned int start, unsigned int end,
unsigned int num_channels)
{
mpd_sint16 *dest = dest0;
int16_t *dest = dest0;
unsigned int i;
for (i = start; i < end; ++i) {
@@ -153,7 +153,7 @@ typedef struct _mp3DecodeData {
struct mad_synth synth;
mad_timer_t timer;
unsigned char readBuffer[READ_BUFFER_SIZE];
mpd_sint16 outputBuffer[MP3_DATA_OUTPUT_BUFFER_SIZE];
int16_t outputBuffer[MP3_DATA_OUTPUT_BUFFER_SIZE];
float totalTime;
float elapsedTime;
enum muteframe muteFrame;
+1 -1
View File
@@ -104,7 +104,7 @@ static int mp4_decode(struct decoder * mpd_decoder, InputStream * inStream)
long seekTableEnd = -1;
int seekPositionFound = 0;
long offset;
mpd_uint16 bitRate = 0;
uint16_t bitRate = 0;
int seeking = 0;
double seek_where = 0;
int initialized = 0;