diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-29 02:35:09 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-29 04:05:48 -0700 |
| commit | fcbcdd9869e3147fe4a30ba808af294f680c9373 (patch) | |
| tree | ccc1799d04cbf2501032107384a81094e18c615a /src/inputPlugins/mpc_plugin.c | |
| parent | c7930c993e4624e4e6d9a50cdea448b432a2bf05 (diff) | |
| download | mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.tar.gz mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.tar.xz mpd-fcbcdd9869e3147fe4a30ba808af294f680c9373.zip | |
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.
Diffstat (limited to 'src/inputPlugins/mpc_plugin.c')
| -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 e5502a2f0..735916cdc 100644 --- a/src/inputPlugins/mpc_plugin.c +++ b/src/inputPlugins/mpc_plugin.c @@ -74,10 +74,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; @@ -121,7 +121,7 @@ static int mpc_decode(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; @@ -175,7 +175,7 @@ static int mpc_decode(InputStream * inStream) dc_action_begin(); samplePos = dc.seek_where * dc.audio_format.sampleRate; if (mpc_decoder_seek_sample(&decoder, samplePos)) { - s16 = (mpd_sint16 *) chunk; + s16 = (int16_t *) chunk; chunkpos = 0; } else dc.seek_where = DC_SEEK_ERROR; @@ -214,7 +214,7 @@ static int mpc_decode(InputStream * inStream) bitRate, replayGainInfo); chunkpos = 0; - s16 = (mpd_sint16 *) chunk; + s16 = (int16_t *) chunk; if (dc_intr()) { eof = 1; break; |