diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-29 15:49:29 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-29 15:49:29 +0200 |
| commit | 226d52b36fe648215f367d352ad6e5eb38e116be (patch) | |
| tree | a8dc789a0f3585b07da36f952a69ff554a1bf999 /src/inputPlugins/mpc_plugin.c | |
| parent | 0352766dca3da5266e4714124fea119be82c4188 (diff) | |
| download | mpd-226d52b36fe648215f367d352ad6e5eb38e116be.tar.gz mpd-226d52b36fe648215f367d352ad6e5eb38e116be.tar.xz mpd-226d52b36fe648215f367d352ad6e5eb38e116be.zip | |
switch to C99 types, part II
Do full C99 integer type conversion in all modules which were not
touched by Eric's merged patch.
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/mpc_plugin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c index ec76b035f..f439b68e6 100644 --- a/src/inputPlugins/mpc_plugin.c +++ b/src/inputPlugins/mpc_plugin.c @@ -66,10 +66,10 @@ static mpc_int32_t mpc_getsize_cb(void *vdata) } /* this _looks_ performance-critical, don't de-inline -- eric */ -static inline mpd_sint16 convertSample(MPC_SAMPLE_FORMAT sample) +static inline int16_t convertSample(MPC_SAMPLE_FORMAT sample) { /* only doing 16-bit audio for now */ - mpd_sint32 val; + int32_t val; const int clip_min = -1 << (16 - 1); const int clip_max = (1 << (16 - 1)) - 1; @@ -114,7 +114,7 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) char chunk[MPC_CHUNK_SIZE]; int chunkpos = 0; long bitRate = 0; - mpd_sint16 *s16 = (mpd_sint16 *) chunk; + int16_t *s16 = (int16_t *) chunk; unsigned long samplePos = 0; mpc_uint32_t vbrUpdateAcc; mpc_uint32_t vbrUpdateBits; @@ -171,7 +171,7 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) audio_format.sampleRate; if (mpc_decoder_seek_sample(&decoder, samplePos)) { decoder_clear(mpd_decoder); - s16 = (mpd_sint16 *) chunk; + s16 = (int16_t *) chunk; chunkpos = 0; decoder_command_finished(mpd_decoder); } else @@ -213,7 +213,7 @@ static int mpc_decode(struct decoder * mpd_decoder, InputStream * inStream) bitRate, replayGainInfo); chunkpos = 0; - s16 = (mpd_sint16 *) chunk; + s16 = (int16_t *) chunk; if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP) { eof = 1; break; |