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

tag/{Id3,Ape}: remove Path overloads

Browse Source
This commit is contained in:
Max Kellermann
2016-02-23 10:30:06 +01:00
parent a1e680fec7
commit cccbcf510a
12 changed files with 34 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tag/ApeLoader.cxx
View File

@@ -20,11 +20,7 @@
#include "config.h"
#include "ApeLoader.hxx"
#include "system/ByteOrder.hxx"
#include "fs/Path.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "input/InputStream.hxx"
#include "input/LocalOpen.hxx"
#include "util/StringView.hxx"
#include "util/Error.hxx"
@@ -108,17 +104,3 @@ tag_ape_scan(InputStream &is, ApeTagCallback callback)
return true;
}
bool
tag_ape_scan(Path path_fs, ApeTagCallback callback)
{
Mutex mutex;
Cond cond;
std::unique_ptr<InputStream> is(OpenLocalInputStream(path_fs, mutex,
cond, IgnoreError()));
if (!is)
return false;
return tag_ape_scan(*is, callback);
}

10
src/tag/ApeLoader.hxx
View File

@@ -42,14 +42,4 @@ typedef std::function<bool(unsigned long flags, const char *key,
bool
tag_ape_scan(InputStream &is, ApeTagCallback callback);
/**
* Scans the APE tag values from a file.
*
* @param path_fs the path of the file in filesystem encoding
* @return false if the file could not be opened or if no APE tag is
* present
*/
bool
tag_ape_scan(Path path_fs, ApeTagCallback callback);
#endif

20
src/tag/ApeReplayGain.cxx
View File

@@ -21,12 +21,9 @@
#include "ApeReplayGain.hxx"
#include "ApeLoader.hxx"
#include "ReplayGain.hxx"
#include "fs/Path.hxx"
#include "util/ASCII.hxx"
#include "util/StringView.hxx"
#include <string.h>
#include <stdlib.h>
static bool
replay_gain_ape_callback(unsigned long flags, const char *key,
@@ -63,20 +60,3 @@ replay_gain_ape_read(InputStream &is, ReplayGainInfo &info)
return tag_ape_scan(is, callback) && found;
}
bool
replay_gain_ape_read(Path path_fs, ReplayGainInfo &info)
{
bool found = false;
auto callback = [&info, &found]
(unsigned long flags, const char *key,
StringView value) {
found |= replay_gain_ape_callback(flags, key,
value,
info);
return true;
};
return tag_ape_scan(path_fs, callback) && found;
}

4
src/tag/ApeReplayGain.hxx
View File

@@ -23,13 +23,9 @@
#include "check.h"
class InputStream;
class Path;
struct ReplayGainInfo;
bool
replay_gain_ape_read(InputStream &is, ReplayGainInfo &info);
bool
replay_gain_ape_read(Path path_fs, ReplayGainInfo &info);
#endif

18
src/tag/ApeTag.cxx
View File

@@ -23,7 +23,6 @@
#include "Tag.hxx"
#include "TagTable.hxx"
#include "TagHandler.hxx"
#include "fs/Path.hxx"
#include "util/StringView.hxx"
#include <string>
@@ -121,20 +120,3 @@ tag_ape_scan2(InputStream &is,
return tag_ape_scan(is, callback) && recognized;
}
bool
tag_ape_scan2(Path path_fs,
const TagHandler &handler, void *handler_ctx)
{
bool recognized = false;
auto callback = [handler, handler_ctx, &recognized]
(unsigned long flags, const char *key,
StringView value) {
recognized |= tag_ape_import_item(flags, key, value,
handler, handler_ctx);
return true;
};
return tag_ape_scan(path_fs, callback) && recognized;
}

10
src/tag/ApeTag.hxx
View File

@@ -22,7 +22,6 @@
#include "TagTable.hxx"
class Path;
class InputStream;
struct TagHandler;
@@ -37,13 +36,4 @@ bool
tag_ape_scan2(InputStream &is,
const TagHandler &handler, void *handler_ctx);
/**
* Scan the APE tags of a file.
*
* @param path_fs the path of the file in filesystem encoding
*/
bool
tag_ape_scan2(Path path_fs,
const TagHandler &handler, void *handler_ctx);
#endif

18
src/tag/Id3Load.cxx
View File

@@ -24,11 +24,7 @@
#include "Log.hxx"
#include "Riff.hxx"
#include "Aiff.hxx"
#include "fs/Path.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "input/InputStream.hxx"
#include "input/LocalOpen.hxx"
#include <id3tag.h>
@@ -225,17 +221,3 @@ tag_id3_load(InputStream &is)
return tag;
}
UniqueId3Tag
tag_id3_load(Path path_fs, Error &error)
{
Mutex mutex;
Cond cond;
std::unique_ptr<InputStream> is(OpenLocalInputStream(path_fs, mutex,
cond, error));
if (!is)
return nullptr;
return tag_id3_load(*is);
}

10
src/tag/Id3Load.hxx
View File

@@ -23,7 +23,6 @@
#include "check.h"
#include "Id3Unique.hxx"
class Path;
class Error;
class InputStream;
@@ -36,13 +35,4 @@ class InputStream;
UniqueId3Tag
tag_id3_load(InputStream &is);
/**
* Loads the ID3 tags from the file into a libid3tag object.
*
* @return nullptr on error or if no ID3 tag was found in the file (no
* Error will be set)
*/
UniqueId3Tag
tag_id3_load(Path path_fs, Error &error);
#endif

24
src/tag/TagId3.cxx
View File

@@ -359,27 +359,3 @@ tag_id3_scan(InputStream &is,
scan_id3_tag(tag.get(), handler, handler_ctx);
return true;
}
bool
tag_id3_scan(Path path_fs,
const TagHandler &handler, void *handler_ctx)
{
UniqueId3Tag tag;
try {
Error error;
tag = tag_id3_load(path_fs, error);
if (tag == nullptr) {
if (error.IsDefined())
LogError(error);
return false;
}
} catch (const std::runtime_error &e) {
LogError(e);
return false;
}
scan_id3_tag(tag.get(), handler, handler_ctx);
return true;
}

15
src/tag/TagId3.hxx
View File

@@ -24,7 +24,6 @@
#include "Compiler.h"
class InputStream;
class Path;
struct TagHandler;
struct Tag;
struct id3_tag;
@@ -35,10 +34,6 @@ bool
tag_id3_scan(InputStream &is,
const TagHandler &handler, void *handler_ctx);
bool
tag_id3_scan(Path path_fs,
const TagHandler &handler, void *handler_ctx);
Tag *
tag_id3_import(id3_tag *);
@@ -52,8 +47,6 @@ scan_id3_tag(id3_tag *tag,
#else
#include "fs/Path.hxx"
static inline bool
tag_id3_scan(gcc_unused InputStream &is,
gcc_unused const TagHandler &handler,
@@ -62,14 +55,6 @@ tag_id3_scan(gcc_unused InputStream &is,
return false;
}
static inline bool
tag_id3_scan(gcc_unused Path path_fs,
gcc_unused const TagHandler &handler,
gcc_unused void *handler_ctx)
{
return false;
}
#endif
#endif