From fcbcdd9869e3147fe4a30ba808af294f680c9373 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Sep 2008 02:35:09 -0700 Subject: 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. --- src/outputBuffer_ob_send.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/outputBuffer_ob_send.h') diff --git a/src/outputBuffer_ob_send.h b/src/outputBuffer_ob_send.h index 310d5f8fd..f27a5c0dc 100644 --- a/src/outputBuffer_ob_send.h +++ b/src/outputBuffer_ob_send.h @@ -37,7 +37,7 @@ static void do_audio_conversion(void **data, size_t *len) static void ensure_audio_format_sanity(void **data, size_t *len) { - static mpd_uint8 seq_last; + static uint8_t seq_last; assert(pthread_equal(pthread_self(), dc.thread)); if (mpd_unlikely(seq_last != ob.seq_decoder)) { @@ -61,7 +61,7 @@ static void start_playback(void) enum dc_action ob_send(void *data, size_t len, - float decode_time, mpd_uint16 bit_rate, ReplayGainInfo * rgi) + float decode_time, uint16_t bit_rate, ReplayGainInfo * rgi) { struct rbvec vec[2]; struct ob_chunk *c; @@ -97,7 +97,7 @@ ob_send(void *data, size_t len, c->bit_rate = bit_rate; c_len = len > CHUNK_SIZE ? CHUNK_SIZE : len; - c->len = (mpd_uint16)c_len; + c->len = (uint16_t)c_len; memcpy(c->data, data, c_len); } else { /* partially filled chunk */ size_t max = CHUNK_SIZE - c->len; -- cgit v1.2.3