diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/decoder/flac_decoder_plugin.c | 6 | ||||
| -rw-r--r-- | src/decoder/ogg_codec.c (renamed from src/decoder/ogg_common.c) | 12 | ||||
| -rw-r--r-- | src/decoder/ogg_codec.h (renamed from src/decoder/ogg_common.h) | 14 | ||||
| -rw-r--r-- | src/decoder/vorbis_decoder_plugin.c | 6 |
5 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 22033787c..9e56ae020 100644 --- a/Makefile.am +++ b/Makefile.am @@ -588,7 +588,7 @@ endif if HAVE_OGG_COMMON libdecoder_plugins_a_SOURCES += \ - src/decoder/ogg_common.c src/decoder/ogg_common.h + src/decoder/ogg_codec.c src/decoder/ogg_codec.h endif if HAVE_FLAC_COMMON diff --git a/src/decoder/flac_decoder_plugin.c b/src/decoder/flac_decoder_plugin.c index 8103a8faf..1913480c5 100644 --- a/src/decoder/flac_decoder_plugin.c +++ b/src/decoder/flac_decoder_plugin.c @@ -23,7 +23,7 @@ #include "flac_metadata.h" #if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7 -#include "ogg_common.h" +#include "ogg_codec.h" #endif #include <glib.h> @@ -433,10 +433,10 @@ oggflac_scan_file(const char *file, static void oggflac_decode(struct decoder *decoder, struct input_stream *input_stream) { - if (ogg_stream_type_detect(decoder, input_stream) != FLAC) + if (ogg_codec_detect(decoder, input_stream) != OGG_CODEC_FLAC) return; - /* rewind the stream, because ogg_stream_type_detect() has + /* rewind the stream, because ogg_codec_detect() has moved it */ input_stream_lock_seek(input_stream, 0, SEEK_SET, NULL); diff --git a/src/decoder/ogg_common.c b/src/decoder/ogg_codec.c index f63bc094b..7d05db8e7 100644 --- a/src/decoder/ogg_common.c +++ b/src/decoder/ogg_codec.c @@ -22,10 +22,10 @@ */ #include "config.h" -#include "ogg_common.h" +#include "ogg_codec.h" -enum ogg_stream_type -ogg_stream_type_detect(struct decoder *decoder, struct input_stream *is) +enum ogg_codec +ogg_codec_detect(struct decoder *decoder, struct input_stream *is) { /* oggflac detection based on code in ogg123 and this post * http://lists.xiph.org/pipermail/flac/2004-December/000393.html @@ -33,13 +33,13 @@ ogg_stream_type_detect(struct decoder *decoder, struct input_stream *is) unsigned char buf[41]; size_t r = decoder_read(decoder, is, buf, sizeof(buf)); if (r < sizeof(buf) || memcmp(buf, "OggS", 4) != 0) - return VORBIS; + return OGG_CODEC_VORBIS; if ((memcmp(buf + 29, "FLAC", 4) == 0 && memcmp(buf + 37, "fLaC", 4) == 0) || memcmp(buf + 28, "FLAC", 4) == 0 || memcmp(buf + 28, "fLaC", 4) == 0) - return FLAC; + return OGG_CODEC_FLAC; - return VORBIS; + return OGG_CODEC_VORBIS; } diff --git a/src/decoder/ogg_common.h b/src/decoder/ogg_codec.h index b3c8de238..ac2cdc0ed 100644 --- a/src/decoder/ogg_common.h +++ b/src/decoder/ogg_codec.h @@ -21,17 +21,17 @@ * Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC) */ -#ifndef MPD_OGG_COMMON_H -#define MPD_OGG_COMMON_H +#ifndef MPD_OGG_CODEC_H +#define MPD_OGG_CODEC_H #include "decoder_api.h" -enum ogg_stream_type { - VORBIS, - FLAC, +enum ogg_codec { + OGG_CODEC_VORBIS, + OGG_CODEC_FLAC, }; -enum ogg_stream_type -ogg_stream_type_detect(struct decoder *decoder, struct input_stream *is); +enum ogg_codec +ogg_codec_detect(struct decoder *decoder, struct input_stream *is); #endif /* _OGG_COMMON_H */ diff --git a/src/decoder/vorbis_decoder_plugin.c b/src/decoder/vorbis_decoder_plugin.c index e59f7a87f..09bb8c2a0 100644 --- a/src/decoder/vorbis_decoder_plugin.c +++ b/src/decoder/vorbis_decoder_plugin.c @@ -19,7 +19,7 @@ #include "config.h" #include "vorbis_comments.h" -#include "ogg_common.h" +#include "ogg_codec.h" #include "audio_check.h" #include "uri.h" #include "tag_handler.h" @@ -184,10 +184,10 @@ vorbis_stream_decode(struct decoder *decoder, const vorbis_info *vi; enum decoder_command cmd = DECODE_COMMAND_NONE; - if (ogg_stream_type_detect(decoder, input_stream) != VORBIS) + if (ogg_codec_detect(decoder, input_stream) != OGG_CODEC_VORBIS) return; - /* rewind the stream, because ogg_stream_type_detect() has + /* rewind the stream, because ogg_codec_detect() has moved it */ input_stream_lock_seek(input_stream, 0, SEEK_SET, NULL); |