oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ogg_common: apply coding style

Browse Source
This commit is contained in:
Max Kellermann 2012-09-04 11:52:18 +02:00
parent 015e1ab183
commit 18e458154a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder/ogg_common.c
View File

@ -24,15 +24,14 @@
#include "config.h" #include "config.h"
#include "ogg_common.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 /* oggflac detection based on code in ogg123 and this post
* http://lists.xiph.org/pipermail/flac/2004-December/000393.html * http://lists.xiph.org/pipermail/flac/2004-December/000393.html
* ogg123 trunk still doesn't have this patch as of June 2005 */ * ogg123 trunk still doesn't have this patch as of June 2005 */
unsigned char buf[41]; unsigned char buf[41];
size_t r; size_t r = decoder_read(NULL, is, buf, sizeof(buf));
r = decoder_read(NULL, inStream, buf, sizeof(buf));
if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0) if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0)
return VORBIS; return VORBIS;

8
src/decoder/ogg_common.h
View File

@ -26,8 +26,12 @@
#include "decoder_api.h" #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 */ #endif /* _OGG_COMMON_H */