fix compilation --without-taglib

This commit is contained in:
Andrzej Rybczak
2012-08-29 09:07:20 +02:00
parent ddeec3aea0
commit 4cb0e2232a
22 changed files with 609 additions and 247 deletions

View File

@@ -36,39 +36,40 @@ struct Song
Song() { }
Song(mpd_song *s);
std::string getURI(unsigned idx = 0) const;
std::string getName(unsigned idx = 0) const;
std::string getDirectory(unsigned idx = 0) const;
std::string getArtist(unsigned idx = 0) const;
std::string getTitle(unsigned idx = 0) const;
std::string getAlbum(unsigned idx = 0) const;
std::string getAlbumArtist(unsigned idx = 0) const;
std::string getTrack(unsigned idx = 0) const;
std::string getTrackNumber(unsigned idx = 0) const;
std::string getDate(unsigned idx = 0) const;
std::string getGenre(unsigned idx = 0) const;
std::string getComposer(unsigned idx = 0) const;
std::string getPerformer(unsigned idx = 0) const;
std::string getDisc(unsigned idx = 0) const;
std::string getComment(unsigned idx = 0) const;
std::string getLength(unsigned idx = 0) const;
std::string getPriority(unsigned idx = 0) const;
virtual std::string getURI(unsigned idx = 0) const;
virtual std::string getName(unsigned idx = 0) const;
virtual std::string getDirectory(unsigned idx = 0) const;
virtual std::string getArtist(unsigned idx = 0) const;
virtual std::string getTitle(unsigned idx = 0) const;
virtual std::string getAlbum(unsigned idx = 0) const;
virtual std::string getAlbumArtist(unsigned idx = 0) const;
virtual std::string getTrack(unsigned idx = 0) const;
virtual std::string getTrackNumber(unsigned idx = 0) const;
virtual std::string getDate(unsigned idx = 0) const;
virtual std::string getGenre(unsigned idx = 0) const;
virtual std::string getComposer(unsigned idx = 0) const;
virtual std::string getPerformer(unsigned idx = 0) const;
virtual std::string getDisc(unsigned idx = 0) const;
virtual std::string getComment(unsigned idx = 0) const;
virtual std::string getLength(unsigned idx = 0) const;
virtual std::string getPriority(unsigned idx = 0) const;
std::string getTags(GetFunction f, const std::string &tag_separator = ", ") const;
virtual std::string getTags(GetFunction f, const std::string &tag_separator = ", ") const;
unsigned getHash() const;
unsigned getDuration() const;
unsigned getPosition() const;
unsigned getID() const;
unsigned getPrio() const;
time_t getMTime() const;
virtual unsigned getHash() const;
virtual unsigned getDuration() const;
virtual unsigned getPosition() const;
virtual unsigned getID() const;
virtual unsigned getPrio() const;
virtual time_t getMTime() const;
bool isFromDatabase() const;
bool isStream() const;
virtual bool isFromDatabase() const;
virtual bool isStream() const;
bool empty() const;
virtual bool empty() const;
std::string toString(const std::string &fmt, const std::string &tag_separator = ", ", const std::string &escape_chars = "") const;
virtual std::string toString(const std::string &fmt, const std::string &tag_separator = ", ",
const std::string &escape_chars = "") const;
static std::string ShowTime(unsigned length);
static bool isFormatOk(const std::string &type, const std::string &fmt);
@@ -76,7 +77,8 @@ struct Song
static const char FormatEscapeCharacter = 1;
private:
std::string ParseFormat(std::string::const_iterator &it, const std::string &tag_separator, const std::string &escape_chars) const;
std::string ParseFormat(std::string::const_iterator &it, const std::string &tag_separator,
const std::string &escape_chars) const;
std::shared_ptr<struct SongImpl> pimpl;
};