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

decoder/mad: change "mp3_" suffix to "mad_"

Browse Source
This commit is contained in:
Max Kellermann 2019-06-16 10:01:10 +02:00
parent 527642a90b
commit 97e6ea57c4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -109,7 +109,7 @@ mad_fixed_to_24_buffer(int32_t *dest, const struct mad_synth *synth,
} }
static bool static bool
mp3_plugin_init(const ConfigBlock &block) mad_plugin_init(const ConfigBlock &block)
{ {
gapless_playback = block.GetBlockValue("gapless", gapless_playback = block.GetBlockValue("gapless",
DEFAULT_GAPLESS_MP3_PLAYBACK); DEFAULT_GAPLESS_MP3_PLAYBACK);
@ -647,7 +647,7 @@ parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
} }
static inline SongTime static inline SongTime
mp3_frame_duration(const struct mad_frame *frame) mad_frame_duration(const struct mad_frame *frame)
{ {
return ToSongTime(frame->header.duration); return ToSongTime(frame->header.duration);
} }
@ -677,7 +677,7 @@ MadDecoder::FileSizeToSongLength()
if (input_stream.KnownSize()) { if (input_stream.KnownSize()) {
offset_type rest = RestIncludingThisFrame(); offset_type rest = RestIncludingThisFrame();
const SongTime frame_duration = mp3_frame_duration(&frame); const SongTime frame_duration = mad_frame_duration(&frame);
const SongTime duration = const SongTime duration =
SongTime::FromScale<uint64_t>(rest, SongTime::FromScale<uint64_t>(rest,
frame.header.bitrate / 8); frame.header.bitrate / 8);
@ -965,7 +965,7 @@ MadDecoder::Read()
} }
static void static void
mp3_decode(DecoderClient &client, InputStream &input_stream) mad_decode(DecoderClient &client, InputStream &input_stream)
{ {
MadDecoder data(&client, input_stream); MadDecoder data(&client, input_stream);
@ -1011,11 +1011,11 @@ mad_decoder_scan_stream(InputStream &is, TagHandler &handler) noexcept
return true; return true;
} }
static const char *const mp3_suffixes[] = { "mp3", "mp2", nullptr }; static const char *const mad_suffixes[] = { "mp3", "mp2", nullptr };
static const char *const mp3_mime_types[] = { "audio/mpeg", nullptr }; static const char *const mad_mime_types[] = { "audio/mpeg", nullptr };
constexpr DecoderPlugin mad_decoder_plugin = constexpr DecoderPlugin mad_decoder_plugin =
DecoderPlugin("mad", mp3_decode, mad_decoder_scan_stream) DecoderPlugin("mad", mad_decode, mad_decoder_scan_stream)
.WithInit(mp3_plugin_init) .WithInit(mad_plugin_init)
.WithSuffixes(mp3_suffixes) .WithSuffixes(mad_suffixes)
.WithMimeTypes(mp3_mime_types); .WithMimeTypes(mad_mime_types);