diff options
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/ogg_common.c | 7 | ||||
| -rw-r--r-- | src/decoder/ogg_common.h | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/decoder/ogg_common.c b/src/decoder/ogg_common.c index d57e247fa..ba1a8edea 100644 --- a/src/decoder/ogg_common.c +++ b/src/decoder/ogg_common.c @@ -24,15 +24,14 @@ #include "config.h" #include "ogg_common.h" -ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream) +enum ogg_stream_type +ogg_stream_type_detect(struct input_stream *is) { /* oggflac detection based on code in ogg123 and this post * http://lists.xiph.org/pipermail/flac/2004-December/000393.html * ogg123 trunk still doesn't have this patch as of June 2005 */ unsigned char buf[41]; - size_t r; - - r = decoder_read(NULL, inStream, buf, sizeof(buf)); + size_t r = decoder_read(NULL, is, buf, sizeof(buf)); if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0) return VORBIS; diff --git a/src/decoder/ogg_common.h b/src/decoder/ogg_common.h index 85e4ebba6..26414e96e 100644 --- a/src/decoder/ogg_common.h +++ b/src/decoder/ogg_common.h @@ -26,8 +26,12 @@ #include "decoder_api.h" -typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type; +enum ogg_stream_type { + VORBIS, + FLAC, +}; -ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream); +enum ogg_stream_type +ogg_stream_type_detect(struct input_stream *is); #endif /* _OGG_COMMON_H */ |