aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-21 20:36:34 +0200
committerMax Kellermann <max@duempel.org>2013-10-21 21:08:12 +0200
commit13e9f18403b98f8123b1b983c4680957d684e47b (patch)
treeef732995e8bbad81f41597fab84c5640004f22fd /test
parent875821f2ba0beeb9556962a536c4c0011913ff15 (diff)
downloadmpd-13e9f18403b98f8123b1b983c4680957d684e47b.tar.gz
mpd-13e9f18403b98f8123b1b983c4680957d684e47b.tar.xz
mpd-13e9f18403b98f8123b1b983c4680957d684e47b.zip
DecoderPlugin: move functions into the struct
Diffstat (limited to 'test')
-rw-r--r--test/read_tags.cxx6
-rw-r--r--test/run_decoder.cxx5
2 files changed, 4 insertions, 7 deletions
diff --git a/test/read_tags.cxx b/test/read_tags.cxx
index c7756524f..a3d48be47 100644
--- a/test/read_tags.cxx
+++ b/test/read_tags.cxx
@@ -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();
}
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index 08f6f66b5..cd61d3beb 100644
--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@@ -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 {