Skip to content

M
mpd
Commit 18f39aa0 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

test/run_decoder: move the DecoderPlugin pointer out of struct Decoder

parent 631b6356
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
test/run_decoder.cxx
View file @ 18f39aa0
...@@ -42,8 +42,6 @@ ...@@ -42,8 +42,6 @@
struct Decoder { struct Decoder {
const char *uri; const char *uri;
const struct DecoderPlugin *plugin;
bool initialized; bool initialized;
}; };
...@@ -203,17 +201,17 @@ int main(int argc, char **argv) ...@@ -203,17 +201,17 @@ int main(int argc, char **argv)
decoder_plugin_init_all(); decoder_plugin_init_all();
decoder.plugin = decoder_plugin_from_name(decoder_name); const DecoderPlugin *plugin = decoder_plugin_from_name(decoder_name);
if (decoder.plugin == NULL) { if (plugin == nullptr) {
fprintf(stderr, "No such decoder: %s\n", decoder_name); fprintf(stderr, "No such decoder: %s\n", decoder_name);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
decoder.initialized = false; decoder.initialized = false;
if (decoder.plugin->file_decode != NULL) { if (plugin->file_decode != nullptr) {
decoder.plugin->FileDecode(decoder, Path::FromFS(decoder.uri)); plugin->FileDecode(decoder, Path::FromFS(decoder.uri));
} else if (decoder.plugin->stream_decode != NULL) { } else if (plugin->stream_decode != nullptr) {
Mutex mutex; Mutex mutex;
Cond cond; Cond cond;
...@@ -228,7 +226,7 @@ int main(int argc, char **argv) ...@@ -228,7 +226,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
decoder.plugin->StreamDecode(decoder, *is); plugin->StreamDecode(decoder, *is);
delete is; delete is;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment