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

decoder: removed plugin method try_decode()

Browse Source 
Instead of having a seprate try_decode() method, let the
stream_decode() and file_decode() methods decide whether they are able
to decode the song.
This commit is contained in:
Max Kellermann
2008-11-10 15:07:01 +01:00
parent 10eea9d981
commit ff1acefb21
5 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder/ffmpeg_plugin.c
View File

@@ -193,12 +193,6 @@ ffmpeg_helper(struct input_stream *input,
return ret;
}
static bool
ffmpeg_try_decode(struct input_stream *input)
{
return ffmpeg_helper(input, NULL, NULL);
}
static enum decoder_command
ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is,
const AVPacket *packet,
@@ -370,7 +364,6 @@ static const char *const ffmpeg_mime_types[] = {
const struct decoder_plugin ffmpeg_plugin = {
.name = "ffmpeg",
.init = ffmpeg_init,
.try_decode = ffmpeg_try_decode,
.stream_decode = ffmpeg_decode,
.tag_dup = ffmpeg_tag,
.suffixes = ffmpeg_suffixes,

14
src/decoder/flac_plugin.c
View File

@@ -434,13 +434,14 @@ out:
static bool
oggflac_decode(struct decoder *decoder, struct input_stream *inStream)
{
return flac_decode_internal(decoder, inStream, true);
}
if (ogg_stream_type_detect(inStream) != FLAC)
return false;
static bool
oggflac_try_decode(struct input_stream *inStream)
{
return ogg_stream_type_detect(inStream) == FLAC;
/* rewind the stream, because ogg_stream_type_detect() has
moved it */
input_stream_seek(inStream, 0, SEEK_SET);
return flac_decode_internal(decoder, inStream, true);
}
static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
@@ -457,7 +458,6 @@ const struct decoder_plugin oggflacPlugin = {
.name = "oggflac",
.init = oggflac_init,
#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7
.try_decode = oggflac_try_decode,
.stream_decode = oggflac_decode,
.tag_dup = oggflac_tag_dup,
.suffixes = oggflac_suffixes,

14
src/decoder/oggvorbis_plugin.c
View File

@@ -214,6 +214,13 @@ oggvorbis_decode(struct decoder *decoder, struct input_stream *inStream)
const char *errorStr;
bool initialized = false;
if (ogg_stream_type_detect(inStream) != VORBIS)
return false;
/* rewind the stream, because ogg_stream_type_detect() has
moved it */
input_stream_seek(inStream, 0, SEEK_SET);
data.inStream = inStream;
data.decoder = decoder;
@@ -351,12 +358,6 @@ static struct tag *oggvorbis_TagDup(const char *file)
return ret;
}
static bool
oggvorbis_try_decode(struct input_stream *inStream)
{
return ogg_stream_type_detect(inStream) == VORBIS;
}
static const char *const oggvorbis_Suffixes[] = { "ogg","oga", NULL };
static const char *const oggvorbis_MimeTypes[] = {
"application/ogg",
@@ -367,7 +368,6 @@ static const char *const oggvorbis_MimeTypes[] = {
const struct decoder_plugin oggvorbisPlugin = {
.name = "oggvorbis",
.try_decode = oggvorbis_try_decode,
.stream_decode = oggvorbis_decode,
.tag_dup = oggvorbis_TagDup,
.suffixes = oggvorbis_Suffixes,