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

DecoderPlugin: pass Path instance to file_decode() and scan_file()

Browse Source
This commit is contained in:
Max Kellermann
2014-02-07 18:52:19 +01:00
parent 37ec29b225
commit 6b421cc354
17 changed files with 103 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/read_tags.cxx
View File

@@ -72,7 +72,7 @@ static const struct tag_handler print_handler = {
int main(int argc, char **argv)
{
const char *decoder_name, *path;
const char *decoder_name;
const struct DecoderPlugin *plugin;
#ifdef HAVE_LOCALE_H
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
}
decoder_name = argv[1];
path = argv[2];
const Path path = Path::FromFS(argv[2]);
#if !GLIB_CHECK_VERSION(2,32,0)
g_thread_init(NULL);
@@ -114,10 +114,11 @@ int main(int argc, char **argv)
Mutex mutex;
Cond cond;
InputStream *is = InputStream::OpenReady(path, mutex, cond,
InputStream *is = InputStream::OpenReady(path.c_str(),
mutex, cond,
error);
if (is == NULL) {
FormatError(error, "Failed to open %s", path);
FormatError(error, "Failed to open %s", path.c_str());
return EXIT_FAILURE;
}
@@ -135,9 +136,9 @@ int main(int argc, char **argv)
}
if (empty) {
tag_ape_scan2(Path::FromFS(path), &print_handler, NULL);
tag_ape_scan2(path, &print_handler, NULL);
if (empty)
tag_id3_scan(Path::FromFS(path), &print_handler, NULL);
tag_id3_scan(path, &print_handler, NULL);
}
return 0;

3
test/run_decoder.cxx
View File

@@ -23,6 +23,7 @@
#include "decoder/DecoderAPI.hxx"
#include "input/Init.hxx"
#include "input/InputStream.hxx"
#include "fs/Path.hxx"
#include "AudioFormat.hxx"
#include "util/Error.hxx"
#include "thread/Cond.hxx"
@@ -211,7 +212,7 @@ int main(int argc, char **argv)
decoder.initialized = false;
if (decoder.plugin->file_decode != NULL) {
decoder.plugin->FileDecode(decoder, decoder.uri);
decoder.plugin->FileDecode(decoder, Path::FromFS(decoder.uri));
} else if (decoder.plugin->stream_decode != NULL) {
Mutex mutex;
Cond cond;