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/metadata_pipe.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 '')
-rw-r--r-- | src/metadata_pipe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/metadata_pipe.c b/src/metadata_pipe.c index f4ff16052..83c36ce1b 100644 --- a/src/metadata_pipe.c +++ b/src/metadata_pipe.c @@ -29,7 +29,7 @@ static struct ringbuf *mp; /* Each one of these is a packet inside the metadata pipe */ struct tag_container { float metadata_time; - mpd_uint8 seq; /* ob.seq_decoder at time of metadata_pipe_send() */ + uint8_t seq; /* ob.seq_decoder at time of metadata_pipe_send() */ struct mpd_tag *tag; /* our payload */ }; @@ -79,8 +79,8 @@ struct mpd_tag * metadata_pipe_recv(void) { struct tag_container tc; size_t r; - static const size_t mpd_uint8_max = 255; /* XXX CLEANUP */ - mpd_uint8 expect_seq = ob_get_player_sequence(); + static const size_t uint8_t_max = 255; /* XXX CLEANUP */ + uint8_t expect_seq = ob_get_player_sequence(); unsigned long current_time = ob_get_elapsed_time(); struct mpd_tag *tag = NULL; @@ -106,7 +106,7 @@ retry: current_tag = tc.tag; ringbuf_read_advance(mp, sizeof(struct tag_container)); } else if (expect_seq > tc.seq || - (!expect_seq && tc.seq == mpd_uint8_max)) { + (!expect_seq && tc.seq == uint8_t_max)) { DEBUG("metadata_pipe: reader is ahead of writer\n"); tag_free(tc.tag); ringbuf_read_advance(mp, sizeof(struct tag_container)); |