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

do not store commands list in MPD::Connection

Browse Source 
it should have sent commandlist begin and end commands from the beginning,
having separated functions just to handle queueing commands was plainly ugly.
This commit is contained in:
Andrzej Rybczak
2009-03-12 17:30:25 +01:00
parent 8a4ee22b61
commit 24c37eb592
11 changed files with 202 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mpdpp.h
View File

@@ -35,7 +35,6 @@ namespace MPD
extern const char *FunctionDisabledFilteringEnabled;
}
enum QueueCommandType { qctAdd, qctAddToPlaylist, qctDelete, qctDeleteID, qctMove, qctPlaylistMove, qctDeleteFromPlaylist };
enum ItemType { itDirectory, itSong, itPlaylist };
enum PlayerState { psUnknown, psStop, psPlay, psPause };
@@ -72,16 +71,6 @@ namespace MPD
class Connection
{
struct QueueCommand
{
QueueCommand() : id(0), id2(0) { }
QueueCommandType type;
std::string playlist_path;
std::string item_path;
int id;
int id2;
};
typedef void (*StatusUpdater) (Connection *, StatusChanges, void *);
typedef void (*ErrorHandler) (Connection *, int, const char *, void *);
@@ -153,16 +142,11 @@ namespace MPD
int AddSong(const std::string &); // returns id of added song
int AddSong(const Song &); // returns id of added song
void QueueAddSong(const std::string &);
void QueueAddSong(const Song &);
void QueueAddToPlaylist(const std::string &, const std::string &);
void QueueAddToPlaylist(const std::string &, const Song &);
void QueueDeleteSong(int);
void QueueDeleteSongId(int);
void QueueMove(int, int);
void QueueMove(const std::string &, int, int);
void QueueDeleteFromPlaylist(const std::string &, int);
bool CommitQueue();
void Delete(int) const;
void DeleteID(int) const;
void Delete(const std::string &, int) const;
void StartCommandsList();
void CommitCommandsList();
void DeletePlaylist(const std::string &) const;
bool SavePlaylist(const std::string &) const;
@@ -187,11 +171,11 @@ namespace MPD
void GetDirectories(const std::string &, TagList &) const;
private:
void ClearQueue();
int CheckForErrors();
mpd_Connection *itsConnection;
bool isConnected;
bool isCommandsListEnabled;
std::string itsErrorMessage;
int itsErrorCode;
@@ -215,7 +199,6 @@ namespace MPD
void *itsErrorHandlerUserdata;
mpd_TagItems itsSearchedField;
std::vector<QueueCommand *> itsQueue;
};
}