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

decoder/wildmidi: move code to wildmidi_output()

Browse Source
This commit is contained in:
Max Kellermann 2016-08-15 10:07:08 +02:00
parent 62000670e3
commit 25deae6cc7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,17 @@ wildmidi_finish(void)
WildMidi_Shutdown(); WildMidi_Shutdown();
} }
static DecoderCommand
wildmidi_output(Decoder &decoder, midi *wm)
{
char buffer[4096];
int length = WildMidi_GetOutput(wm, buffer, sizeof(buffer));
if (length <= 0)
return DecoderCommand::STOP;
return decoder_data(decoder, nullptr, buffer, length, 0);
}
static void static void
wildmidi_file_decode(Decoder &decoder, Path path_fs) wildmidi_file_decode(Decoder &decoder, Path path_fs)
{ {
@ -94,18 +105,11 @@ wildmidi_file_decode(Decoder &decoder, Path path_fs)
DecoderCommand cmd; DecoderCommand cmd;
do { do {
char buffer[4096];
int len;
info = WildMidi_GetInfo(wm); info = WildMidi_GetInfo(wm);
if (info == nullptr) if (info == nullptr)
break; break;
len = WildMidi_GetOutput(wm, buffer, sizeof(buffer)); cmd = wildmidi_output(decoder, wm);
if (len <= 0)
break;
cmd = decoder_data(decoder, nullptr, buffer, len, 0);
if (cmd == DecoderCommand::SEEK) { if (cmd == DecoderCommand::SEEK) {
unsigned long seek_where = unsigned long seek_where =