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

Mapper: remove unused functions

Browse Source
This commit is contained in:
Max Kellermann 2014-02-07 23:03:25 +01:00
parent b531c4c2fe
commit 027b2063ba
2 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Mapper.cxx
View File

@ -23,10 +23,6 @@
#include "config.h" #include "config.h"
#include "Mapper.hxx" #include "Mapper.hxx"
#include "DetachedSong.hxx"
#include "db/Directory.hxx"
#include "db/Song.hxx"
#include "db/LightSong.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "fs/Charset.hxx" #include "fs/Charset.hxx"
@ -36,7 +32,6 @@
#include "Log.hxx" #include "Log.hxx"
#include <assert.h> #include <assert.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
@ -44,12 +39,6 @@ static constexpr Domain mapper_domain("mapper");
#ifdef ENABLE_DATABASE #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 * The absolute path of the music directory encoded in the filesystem
* character set. * character set.
@ -105,8 +94,7 @@ mapper_set_music_dir(AllocatedPath &&path)
music_dir_fs = std::move(path); music_dir_fs = std::move(path);
music_dir_fs.ChopSeparators(); music_dir_fs.ChopSeparators();
music_dir_utf8 = music_dir_fs.ToUTF8(); const auto music_dir_utf8 = music_dir_fs.ToUTF8();
music_dir_utf8_length = music_dir_utf8.length();
check_directory(music_dir_utf8.c_str(), music_dir_fs); check_directory(music_dir_utf8.c_str(), music_dir_fs);
} }
@ -144,24 +132,6 @@ void mapper_finish(void)
#ifdef ENABLE_DATABASE #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 AllocatedPath
map_uri_fs(const char *uri) map_uri_fs(const char *uri)
{ {

34
src/Mapper.hxx
View File

@ -31,10 +31,6 @@
#define PLAYLIST_FILE_SUFFIX ".m3u" #define PLAYLIST_FILE_SUFFIX ".m3u"
class AllocatedPath; class AllocatedPath;
struct Directory;
struct Song;
struct LightSong;
class DetachedSong;
void void
mapper_init(AllocatedPath &&music_dir, AllocatedPath &&playlist_dir); mapper_init(AllocatedPath &&music_dir, AllocatedPath &&playlist_dir);
@ -43,36 +39,6 @@ void mapper_finish(void);
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
/**
* Return the absolute path of the music directory encoded in UTF-8 or
* nullptr if no music directory was configured.
*/
gcc_const
const char *
mapper_get_music_directory_utf8(void);
/**
* Return the absolute path of the music directory encoded in the
* filesystem character set.
*/
gcc_const
const AllocatedPath &
mapper_get_music_directory_fs(void);
/**
* Returns true if a music directory was configured.
*/
gcc_const
static inline bool
mapper_has_music_directory(void)
{
return mapper_get_music_directory_utf8() != nullptr;
}
#endif
#ifdef ENABLE_DATABASE
/** /**
* Determines the absolute file system path of a relative URI. This * Determines the absolute file system path of a relative URI. This
* is basically done by converting the URI to the file system charset * is basically done by converting the URI to the file system charset