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

decoder: return void from decode() methods

Browse Source 
The stream_decode() and file_decode() methods returned a boolean,
indicating whether they were able to decode the song.  This is
redundant, since we already know that: if decoder_initialized() has
been called (and dc.state==DECODE), the plugin succeeded.  Change both
methods to return void.
This commit is contained in:
Max Kellermann
2008-11-11 17:13:44 +01:00
parent 05e69ac086
commit 9eed41911f
13 changed files with 56 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/decoder/flac_plugin.c
View File

@@ -301,7 +301,7 @@ static struct tag *flacTagDup(const char *file)
return ret;
}
static bool
static void
flac_decode_internal(struct decoder * decoder, struct input_stream *inStream,
bool is_ogg)
{
@@ -310,7 +310,7 @@ flac_decode_internal(struct decoder * decoder, struct input_stream *inStream,
const char *err = NULL;
if (!(flacDec = flac_new()))
return false;
return;
init_FlacData(&data, decoder, inStream);
#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7
@@ -375,15 +375,15 @@ fail:
if (err) {
ERROR("flac %s\n", err);
return false;
return;
}
return true;
return;
}
static bool
static void
flac_decode(struct decoder * decoder, struct input_stream *inStream)
{
return flac_decode_internal(decoder, inStream, false);
flac_decode_internal(decoder, inStream, false);
}
#ifndef HAVE_OGGFLAC
@@ -431,17 +431,17 @@ out:
return ret;
}
static bool
static void
oggflac_decode(struct decoder *decoder, struct input_stream *inStream)
{
if (ogg_stream_type_detect(inStream) != FLAC)
return false;
return;
/* 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);
flac_decode_internal(decoder, inStream, true);
}
static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };