---
Makefile.am | 2 -
src/TagFile.cxx | 100 -------------------------------------------
src/TagFile.hxx | 38 ----------------
src/command/FileCommands.cxx | 1 -
4 files changed, 141 deletions(-)
delete mode 100644 src/TagFile.cxx
delete mode 100644 src/TagFile.hxx
diff --git a/Makefile.am b/Makefile.am
index 937b1fc..95a9fa4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -175,7 +175,6 @@ libmpd_a_SOURCES = \
src/Stats.cxx src/Stats.hxx \
src/TagPrint.cxx src/TagPrint.hxx \
src/TagSave.cxx src/TagSave.hxx \
- src/TagFile.cxx src/TagFile.hxx \
src/TagStream.cxx src/TagStream.hxx \
src/TimePrint.cxx src/TimePrint.hxx \
src/mixer/Volume.cxx src/mixer/Volume.hxx \
@@ -1778,7 +1777,6 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
src/Log.cxx src/LogBackend.cxx \
src/IOThread.cxx \
src/TagSave.cxx \
- src/TagFile.cxx \
src/AudioFormat.cxx src/CheckAudioFormat.cxx \
src/DetachedSong.cxx
diff --git a/src/TagFile.cxx b/src/TagFile.cxx
deleted file mode 100644
index 0640c13..0000000
--- a/src/TagFile.cxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2003-2015 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "TagFile.hxx"
-#include "fs/Path.hxx"
-#include "util/UriUtil.hxx"
-#include "util/Error.hxx"
-#include "decoder/DecoderList.hxx"
-#include "decoder/DecoderPlugin.hxx"
-#include "input/InputStream.hxx"
-#include "input/LocalOpen.hxx"
-#include "thread/Cond.hxx"
-
-#include <assert.h>
-
-class TagFileScan {
- const Path path_fs;
- const char *const suffix;
-
- const tag_handler &handler;
- void *handler_ctx;
-
- Mutex mutex;
- Cond cond;
- InputStream *is;
-
-public:
- TagFileScan(Path _path_fs, const char *_suffix,
- const tag_handler &_handler, void *_handler_ctx)
- :path_fs(_path_fs), suffix(_suffix),
- handler(_handler), handler_ctx(_handler_ctx) ,
- is(nullptr) {}
-
- ~TagFileScan() {
- delete is;
- }
-
- bool ScanFile(const DecoderPlugin &plugin) {
- return plugin.ScanFile(path_fs, handler, handler_ctx);
- }
-
- bool ScanStream(const DecoderPlugin &plugin) {
- if (plugin.scan_stream == nullptr)
- return false;
-
- /* open the InputStream (if not already open) */
- if (is == nullptr) {
- is = OpenLocalInputStream(path_fs,
- mutex, cond,
- IgnoreError());
- if (is == nullptr)
- return false;
- } else
- is->LockRewind(IgnoreError());
-
- /* now try the stream_tag() method */
- return plugin.ScanStream(*is, handler, handler_ctx);
- }
-
- bool Scan(const DecoderPlugin &plugin) {
- return plugin.SupportsSuffix(suffix) &&
- (ScanFile(plugin) || ScanStream(plugin));
- }
-};
-
-bool
-tag_file_scan(Path path_fs, const tag_handler &handler, void *handler_ctx)
-{
- assert(!path_fs.IsNull());
-
- /* check if there's a suffix and a plugin */
-
- const auto *suffix = path_fs.GetSuffix();
- if (suffix == nullptr)
- return false;
-
- const auto suffix_utf8 = Path::FromFS(suffix).ToUTF8();
-
- TagFileScan tfs(path_fs, suffix_utf8.c_str(), handler, handler_ctx);
- return decoder_plugins_try([&](const DecoderPlugin &plugin){
- return tfs.Scan(plugin);
- });
-}
diff --git a/src/TagFile.hxx b/src/TagFile.hxx
deleted file mode 100644
index 6c2c5b4..0000000
--- a/src/TagFile.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2003-2015 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_TAG_FILE_HXX
-#define MPD_TAG_FILE_HXX
-
-#include "check.h"
-
-class Path;
-struct tag_handler;
-
-/**
- * Scan the tags of a song file. Invokes matching decoder plugins,
- * but does not invoke the special "APE" and "ID3" scanners.
- *
- * @return true if the file was recognized (even if no metadata was
- * found)
- */
-bool
-tag_file_scan(Path path, const tag_handler &handler, void *handler_ctx);
-
-#endif
diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx
index 9085440..6325ca0 100644
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -33,7 +33,6 @@
#include "tag/ApeTag.hxx"
#include "tag/TagId3.hxx"
#include "TagStream.hxx"
-#include "TagFile.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include "storage/StorageInterface.hxx"
--
2.1.4
_______________________________________________
mpd-devel mailing list
[email protected]
http://mailman.blarg.de/listinfo/mpd-devel
