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

DecoderPlugin: move functions into the struct

Browse Source
This commit is contained in:
Max Kellermann
2013-10-21 20:36:34 +02:00
parent 875821f2ba
commit 13e9f18403
8 changed files with 98 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/read_tags.cxx
View File

@@ -181,8 +181,7 @@ int main(int argc, char **argv)
return 1;
}
bool success = decoder_plugin_scan_file(*plugin, path,
&print_handler, NULL);
bool success = plugin->ScanFile(path, print_handler, nullptr);
if (!success && plugin->scan_stream != NULL) {
Mutex mutex;
Cond cond;
@@ -209,8 +208,7 @@ int main(int argc, char **argv)
mutex.unlock();
success = decoder_plugin_scan_stream(*plugin, is,
&print_handler, NULL);
success = plugin->ScanStream(*is, print_handler, nullptr);
is->Close();
}

5
test/run_decoder.cxx
View File

@@ -184,8 +184,7 @@ int main(int argc, char **argv)
decoder.initialized = false;
if (decoder.plugin->file_decode != NULL) {
decoder_plugin_file_decode(*decoder.plugin, &decoder,
decoder.uri);
decoder.plugin->FileDecode(decoder, decoder.uri);
} else if (decoder.plugin->stream_decode != NULL) {
Mutex mutex;
Cond cond;
@@ -201,7 +200,7 @@ int main(int argc, char **argv)
return 1;
}
decoder_plugin_stream_decode(*decoder.plugin, &decoder, is);
decoder.plugin->StreamDecode(decoder, *is);
is->Close();
} else {