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

test/run_decoder: move the "uri" attribute out of struct Decoder

Browse Source
This commit is contained in:
Max Kellermann 2014-05-22 11:17:11 +02:00
parent 18f39aa012
commit 426e0105a6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/run_decoder.cxx
View File

@ -40,8 +40,6 @@
#include <stdio.h> #include <stdio.h>
struct Decoder { struct Decoder {
const char *uri;
bool initialized; bool initialized;
}; };
@ -173,16 +171,14 @@ decoder_mixramp(gcc_unused Decoder &decoder, gcc_unused MixRampInfo &&mix_ramp)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const char *decoder_name;
if (argc != 3) { if (argc != 3) {
fprintf(stderr, "Usage: run_decoder DECODER URI >OUT\n"); fprintf(stderr, "Usage: run_decoder DECODER URI >OUT\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
Decoder decoder; Decoder decoder;
decoder_name = argv[1]; const char *const decoder_name = argv[1];
decoder.uri = argv[2]; const char *const uri = argv[2];
#ifdef HAVE_GLIB #ifdef HAVE_GLIB
#if !GLIB_CHECK_VERSION(2,32,0) #if !GLIB_CHECK_VERSION(2,32,0)
@ -210,13 +206,13 @@ int main(int argc, char **argv)
decoder.initialized = false; decoder.initialized = false;
if (plugin->file_decode != nullptr) { if (plugin->file_decode != nullptr) {
plugin->FileDecode(decoder, Path::FromFS(decoder.uri)); plugin->FileDecode(decoder, Path::FromFS(uri));
} else if (plugin->stream_decode != nullptr) { } else if (plugin->stream_decode != nullptr) {
Mutex mutex; Mutex mutex;
Cond cond; Cond cond;
InputStream *is = InputStream *is =
InputStream::OpenReady(decoder.uri, mutex, cond, error); InputStream::OpenReady(uri, mutex, cond, error);
if (is == NULL) { if (is == NULL) {
if (error.IsDefined()) if (error.IsDefined())
LogError(error); LogError(error);