Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation --with-iconv

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-23 02:45:48 +02:00
parent 24627d8493
commit 66d4883728
9 changed files with 74 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/song.h
View File

@@ -34,7 +34,7 @@ namespace MPD
typedef void (Song::*SetFunction)(const std::string &);
typedef std::string (Song::*GetFunction)() const;
Song() : itsSong(0), itsSlash(std::string::npos), itsHash(0), copyPtr(0), isLocalised(0) { }
Song() : itsSong(0), itsFile(0), itsSlash(std::string::npos), itsHash(0), copyPtr(0), isLocalised(0) { }
Song(mpd_song *, bool = 0);
Song(const Song &);
~Song();
@@ -60,7 +60,6 @@ namespace MPD
unsigned GetPosition() const { return mpd_song_get_pos(itsSong); }
unsigned GetID() const { return mpd_song_get_id(itsSong); }
//void SetFile(const std::string &);
void SetArtist(const std::string &);
void SetTitle(const std::string &);
void SetAlbum(const std::string &);
@@ -100,8 +99,21 @@ namespace MPD
void SetHashAndSlash();
std::string ParseFormat(std::string::const_iterator &it) const;
/// Used internally for handling filename, since we don't have
/// write access to file string in mpd_song, manage our own if
/// localization was done and there is localized filename that
/// is different than the original one.
///
const char *MyFilename() const;
/// internal mpd_song structure
mpd_song *itsSong;
/// localized version of filename
const char *itsFile;
std::string itsNewName;
size_t itsSlash;
unsigned itsHash;
bool copyPtr;