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

TagFile: use Path instead of const char *

Browse Source
This commit is contained in:
Max Kellermann
2013-10-26 15:14:54 +02:00
parent 4a5aad0948
commit a40246d312
16 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TagFile.cxx
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include "TagFile.hxx"
#include "fs/Path.hxx"
#include "util/UriUtil.hxx"
#include "util/Error.hxx"
#include "DecoderList.hxx"
@@ -29,15 +30,15 @@
#include <assert.h>
bool
tag_file_scan(const char *path_fs,
tag_file_scan(Path path_fs,
const struct tag_handler *handler, void *handler_ctx)
{
assert(path_fs != nullptr);
assert(!path_fs.IsNull());
assert(handler != nullptr);
/* check if there's a suffix and a plugin */
const char *suffix = uri_get_suffix(path_fs);
const char *suffix = uri_get_suffix(path_fs.c_str());
if (suffix == nullptr)
return false;
@@ -52,7 +53,7 @@ tag_file_scan(const char *path_fs,
do {
/* load file tag */
if (plugin->ScanFile(path_fs,
if (plugin->ScanFile(path_fs.c_str(),
*handler, handler_ctx))
break;
@@ -61,7 +62,8 @@ tag_file_scan(const char *path_fs,
/* open the InputStream (if not already
open) */
if (is == nullptr)
is = InputStream::Open(path_fs, mutex, cond,
is = InputStream::Open(path_fs.c_str(),
mutex, cond,
IgnoreError());
/* now try the stream_tag() method */