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

decoder/wildmidi: convert WILDMIDI_SAMPLE_RATE to AudioFormat

Browse Source
This commit is contained in:
Max Kellermann 2018-07-07 13:36:18 +02:00
parent 3d27fffc50
commit ed6d0aa548
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/decoder/plugins/WildmidiDecoderPlugin.cxx
View File

@ -33,7 +33,7 @@ extern "C" {
static constexpr Domain wildmidi_domain("wildmidi"); static constexpr Domain wildmidi_domain("wildmidi");
static constexpr unsigned WILDMIDI_SAMPLE_RATE = 48000; static constexpr AudioFormat wildmidi_audio_format{48000, SampleFormat::S16, 2};
static bool static bool
wildmidi_init(const ConfigBlock &block) wildmidi_init(const ConfigBlock &block)
@ -50,7 +50,8 @@ wildmidi_init(const ConfigBlock &block)
return false; return false;
} }
return WildMidi_Init(path.c_str(), WILDMIDI_SAMPLE_RATE, 0) == 0; return WildMidi_Init(path.c_str(), wildmidi_audio_format.sample_rate,
0) == 0;
} }
static void static void
@ -80,11 +81,6 @@ wildmidi_output(DecoderClient &client, midi *wm)
static void static void
wildmidi_file_decode(DecoderClient &client, Path path_fs) wildmidi_file_decode(DecoderClient &client, Path path_fs)
{ {
static constexpr AudioFormat audio_format = {
WILDMIDI_SAMPLE_RATE,
SampleFormat::S16,
2,
};
midi *wm; midi *wm;
const struct _WM_Info *info; const struct _WM_Info *info;
@ -100,9 +96,9 @@ wildmidi_file_decode(DecoderClient &client, Path path_fs)
const auto duration = const auto duration =
SongTime::FromScale<uint64_t>(info->approx_total_samples, SongTime::FromScale<uint64_t>(info->approx_total_samples,
WILDMIDI_SAMPLE_RATE); wildmidi_audio_format.sample_rate);
client.Ready(audio_format, true, duration); client.Ready(wildmidi_audio_format, true, duration);
DecoderCommand cmd; DecoderCommand cmd;
do { do {
@ -140,7 +136,7 @@ wildmidi_scan_file(Path path_fs, TagHandler &handler) noexcept
const auto duration = const auto duration =
SongTime::FromScale<uint64_t>(info->approx_total_samples, SongTime::FromScale<uint64_t>(info->approx_total_samples,
WILDMIDI_SAMPLE_RATE); wildmidi_audio_format.sample_rate);
handler.OnDuration(duration); handler.OnDuration(duration);
WildMidi_Close(wm); WildMidi_Close(wm);