diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-07 23:03:25 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-07 23:03:25 +0100 |
| commit | 027b2063ba450e1d0049907f9c5f22abcc1236ac (patch) | |
| tree | b2c930eb7ae3892cdfc5f8b463537836c5593cc5 /src/Mapper.cxx | |
| parent | b531c4c2feb39b6c6d741d384fcc192c54b3a702 (diff) | |
| download | mpd-027b2063ba450e1d0049907f9c5f22abcc1236ac.tar.gz mpd-027b2063ba450e1d0049907f9c5f22abcc1236ac.tar.xz mpd-027b2063ba450e1d0049907f9c5f22abcc1236ac.zip | |
Mapper: remove unused functions
Diffstat (limited to 'src/Mapper.cxx')
| -rw-r--r-- | src/Mapper.cxx | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx index 1073068f5..fc5a9cfe0 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -23,10 +23,6 @@ #include "config.h" #include "Mapper.hxx" -#include "DetachedSong.hxx" -#include "db/Directory.hxx" -#include "db/Song.hxx" -#include "db/LightSong.hxx" #include "fs/AllocatedPath.hxx" #include "fs/Traits.hxx" #include "fs/Charset.hxx" @@ -36,7 +32,6 @@ #include "Log.hxx" #include <assert.h> -#include <string.h> #include <sys/stat.h> #include <errno.h> @@ -45,12 +40,6 @@ static constexpr Domain mapper_domain("mapper"); #ifdef ENABLE_DATABASE /** - * The absolute path of the music directory encoded in UTF-8. - */ -static std::string music_dir_utf8; -static size_t music_dir_utf8_length; - -/** * The absolute path of the music directory encoded in the filesystem * character set. */ @@ -105,8 +94,7 @@ mapper_set_music_dir(AllocatedPath &&path) music_dir_fs = std::move(path); music_dir_fs.ChopSeparators(); - music_dir_utf8 = music_dir_fs.ToUTF8(); - music_dir_utf8_length = music_dir_utf8.length(); + const auto music_dir_utf8 = music_dir_fs.ToUTF8(); check_directory(music_dir_utf8.c_str(), music_dir_fs); } @@ -144,24 +132,6 @@ void mapper_finish(void) #ifdef ENABLE_DATABASE -const char * -mapper_get_music_directory_utf8(void) -{ - return music_dir_utf8.empty() - ? nullptr - : music_dir_utf8.c_str(); -} - -const AllocatedPath & -mapper_get_music_directory_fs(void) -{ - return music_dir_fs; -} - -#endif - -#ifdef ENABLE_DATABASE - AllocatedPath map_uri_fs(const char *uri) { |