mpd: adjust indentation

This commit is contained in:
Andrzej Rybczak
2012-09-06 13:31:07 +02:00
parent 472c69e8cd
commit 0147a24add
2 changed files with 314 additions and 310 deletions

View File

@@ -27,237 +27,237 @@
#include <mpd/client.h>
#include "song.h"
namespace MPD
{
enum ItemType { itDirectory, itSong, itPlaylist };
enum PlayerState { psUnknown, psStop, psPlay, psPause };
enum ReplayGainMode { rgmOff, rgmTrack, rgmAlbum };
namespace MPD {//
struct Item
{
std::shared_ptr<Song> song;
ItemType type;
std::string name;
};
struct StatusChanges
{
StatusChanges() : Playlist(0), StoredPlaylists(0), SongID(0), Database(0), DBUpdating(0), Volume(0), ElapsedTime(0), Crossfade(0), Random(0), Repeat(0), Single(0), Consume(0), PlayerState(0), StatusFlags(0), Outputs(0) { }
bool Playlist:1;
bool StoredPlaylists:1;
bool SongID:1;
bool Database:1;
bool DBUpdating:1;
bool Volume:1;
bool ElapsedTime:1;
bool Crossfade:1;
bool Random:1;
bool Repeat:1;
bool Single:1;
bool Consume:1;
bool PlayerState:1;
bool StatusFlags:1;
bool Outputs:1;
};
struct Output
{
Output(const std::string &name_, bool enabled) : m_name(name_), m_enabled(enabled) { }
const std::string &name() const { return m_name; }
bool isEnabled() const { return m_enabled; }
private:
std::string m_name;
bool m_enabled;
};
typedef std::vector<Item> ItemList;
typedef std::vector<std::string> StringList;
typedef std::vector<Output> OutputList;
enum ItemType { itDirectory, itSong, itPlaylist };
enum PlayerState { psUnknown, psStop, psPlay, psPause };
enum ReplayGainMode { rgmOff, rgmTrack, rgmAlbum };
struct Item
{
std::shared_ptr<Song> song;
ItemType type;
std::string name;
};
struct StatusChanges
{
StatusChanges() : Playlist(0), StoredPlaylists(0), SongID(0), Database(0), DBUpdating(0), Volume(0), ElapsedTime(0), Crossfade(0), Random(0), Repeat(0), Single(0), Consume(0), PlayerState(0), StatusFlags(0), Outputs(0) { }
bool Playlist:1;
bool StoredPlaylists:1;
bool SongID:1;
bool Database:1;
bool DBUpdating:1;
bool Volume:1;
bool ElapsedTime:1;
bool Crossfade:1;
bool Random:1;
bool Repeat:1;
bool Single:1;
bool Consume:1;
bool PlayerState:1;
bool StatusFlags:1;
bool Outputs:1;
};
struct Output
{
Output(const std::string &name_, bool enabled) : m_name(name_), m_enabled(enabled) { }
const std::string &name() const { return m_name; }
bool isEnabled() const { return m_enabled; }
private:
std::string m_name;
bool m_enabled;
};
typedef std::vector<Item> ItemList;
typedef std::vector<std::string> StringList;
typedef std::vector<Output> OutputList;
class Connection
{
typedef void (*StatusUpdater) (Connection *, StatusChanges, void *);
typedef void (*ErrorHandler) (Connection *, int, const char *, void *);
public:
Connection();
~Connection();
bool Connect();
bool Connected() const;
void Disconnect();
const std::string & GetHostname() { return itsHost; }
int GetPort() { return itsPort; }
unsigned Version() const;
void SetIdleEnabled(bool val) { isIdleEnabled = val; }
void BlockIdle(bool val) { itsIdleBlocked = val; }
bool SupportsIdle() const { return supportsIdle; }
void OrderDataFetching() { hasData = 1; }
int GetFD() const { return itsFD; }
void SetHostname(const std::string &);
void SetPort(int port) { itsPort = port; }
void SetTimeout(int timeout) { itsTimeout = timeout; }
void SetPassword(const std::string &password) { itsPassword = password; }
bool SendPassword();
void SetStatusUpdater(StatusUpdater, void *);
void SetErrorHandler(ErrorHandler, void *);
void UpdateStatus();
void UpdateStats();
bool UpdateDirectory(const std::string &);
void Play();
void Play(int);
void PlayID(int);
void Pause(bool);
void Toggle();
void Stop();
void Next();
void Prev();
bool Move(unsigned, unsigned);
void Swap(unsigned, unsigned);
void Seek(unsigned);
void Shuffle();
bool ClearMainPlaylist();
bool isPlaying() const { return GetState() > psStop; }
PlayerState GetState() const { return itsCurrentStatus ? PlayerState(mpd_status_get_state(itsCurrentStatus)) : psUnknown; }
PlayerState GetOldState() const { return itsOldStatus ? PlayerState(mpd_status_get_state(itsOldStatus)) : psUnknown; }
bool GetRepeat() const { return itsCurrentStatus ? mpd_status_get_repeat(itsCurrentStatus) : 0; }
bool GetRandom() const { return itsCurrentStatus ? mpd_status_get_random(itsCurrentStatus) : 0; }
bool GetSingle() const { return itsCurrentStatus ? mpd_status_get_single(itsCurrentStatus) : 0; }
bool GetConsume() const { return itsCurrentStatus ? mpd_status_get_consume(itsCurrentStatus) : 0; }
bool GetDBIsUpdating() const { return itsCurrentStatus ? mpd_status_get_update_id(itsCurrentStatus) : 0; }
int GetVolume() const { return itsCurrentStatus ? mpd_status_get_volume(itsCurrentStatus) : -1; }
unsigned GetCrossfade() const { return itsCurrentStatus ? mpd_status_get_crossfade(itsCurrentStatus) : 0; }
unsigned GetPlaylistID() const { return itsCurrentStatus ? mpd_status_get_queue_version(itsCurrentStatus) : 0; }
unsigned GetOldPlaylistID() const { return itsOldStatus ? mpd_status_get_queue_version(itsOldStatus) : 0; }
unsigned GetElapsedTime() const { return itsCurrentStatus ? itsElapsed : 0; }
int GetTotalTime() const { return itsCurrentStatus ? mpd_status_get_total_time(itsCurrentStatus) : 0; }
unsigned GetBitrate() const { return itsCurrentStatus ? mpd_status_get_kbit_rate(itsCurrentStatus) : 0; }
unsigned NumberOfArtists() const { return itsStats ? mpd_stats_get_number_of_artists(itsStats) : 0; }
unsigned NumberOfAlbums() const { return itsStats ? mpd_stats_get_number_of_albums(itsStats) : 0; }
unsigned NumberOfSongs() const { return itsStats ? mpd_stats_get_number_of_songs(itsStats) : 0; }
unsigned long Uptime() const { return itsStats ? mpd_stats_get_uptime(itsStats) : 0; }
unsigned long DBUpdateTime() const { return itsStats ? mpd_stats_get_db_update_time(itsStats) : 0; }
unsigned long PlayTime() const { return itsStats ? mpd_stats_get_play_time(itsStats) : 0; }
unsigned long DBPlayTime() const { return itsStats ? mpd_stats_get_db_play_time(itsStats) : 0; }
size_t GetPlaylistLength() const { return itsCurrentStatus ? mpd_status_get_queue_length(itsCurrentStatus) : 0; }
SongList GetPlaylistChanges(unsigned);
const std::string &GetErrorMessage() const { return itsErrorMessage; }
Song GetCurrentlyPlayingSong();
int GetCurrentlyPlayingSongPos() const;
int GetCurrentSongPos() const;
Song GetSong(const std::string &);
SongList GetPlaylistContent(const std::string &);
void GetSupportedExtensions(std::set<std::string> &);
void SetRepeat(bool);
void SetRandom(bool);
void SetSingle(bool);
void SetConsume(bool);
void SetCrossfade(unsigned);
void SetVolume(unsigned);
std::string GetReplayGainMode();
void SetReplayGainMode(ReplayGainMode);
bool SetPriority(const Song &s, int prio);
int AddSong(const std::string &, int = -1); // returns id of added song
int AddSong(const Song &, int = -1); // returns id of added song
bool AddRandomTag(mpd_tag_type, size_t);
bool AddRandomSongs(size_t);
bool Add(const std::string &path);
bool Delete(unsigned);
bool DeleteID(unsigned);
bool PlaylistDelete(const std::string &, unsigned);
void StartCommandsList();
bool CommitCommandsList();
bool DeletePlaylist(const std::string &);
bool LoadPlaylist(const std::string &name);
int SavePlaylist(const std::string &);
bool ClearPlaylist(const std::string &);
void AddToPlaylist(const std::string &, const Song &);
void AddToPlaylist(const std::string &, const std::string &);
bool PlaylistMove(const std::string &, int, int);
bool Rename(const std::string &, const std::string &);
void StartSearch(bool);
void StartFieldSearch(mpd_tag_type);
void AddSearch(mpd_tag_type, const std::string &) const;
void AddSearchAny(const std::string &str) const;
void AddSearchURI(const std::string &str) const;
SongList CommitSearchSongs();
StringList CommitSearchTags();
StringList GetPlaylists();
StringList GetList(mpd_tag_type);
ItemList GetDirectory(const std::string &);
SongList GetDirectoryRecursive(const std::string &);
SongList GetSongs(const std::string &);
StringList GetDirectories(const std::string &);
OutputList GetOutputs();
bool EnableOutput(int);
bool DisableOutput(int);
StringList GetURLHandlers();
StringList GetTagTypes();
private:
void GoIdle();
int GoBusy();
int CheckForErrors();
mpd_connection *itsConnection;
bool isCommandsListEnabled;
std::string itsErrorMessage;
int itsFD;
bool isIdle;
bool isIdleEnabled;
bool itsIdleBlocked;
bool supportsIdle;
bool hasData;
std::string itsHost;
int itsPort;
int itsTimeout;
std::string itsPassword;
mpd_status *itsCurrentStatus;
mpd_status *itsOldStatus;
mpd_stats *itsStats;
unsigned itsElapsed;
time_t itsElapsedTimer[2];
StatusChanges itsChanges;
StatusUpdater itsUpdater;
void *itsStatusUpdaterUserdata;
ErrorHandler itsErrorHandler;
void *itsErrorHandlerUserdata;
mpd_tag_type itsSearchedField;
};
class Connection
{
typedef void (*StatusUpdater) (Connection *, StatusChanges, void *);
typedef void (*ErrorHandler) (Connection *, int, const char *, void *);
public:
Connection();
~Connection();
bool Connect();
bool Connected() const;
void Disconnect();
const std::string & GetHostname() { return itsHost; }
int GetPort() { return itsPort; }
unsigned Version() const;
void SetIdleEnabled(bool val) { isIdleEnabled = val; }
void BlockIdle(bool val) { itsIdleBlocked = val; }
bool SupportsIdle() const { return supportsIdle; }
void OrderDataFetching() { hasData = 1; }
int GetFD() const { return itsFD; }
void SetHostname(const std::string &);
void SetPort(int port) { itsPort = port; }
void SetTimeout(int timeout) { itsTimeout = timeout; }
void SetPassword(const std::string &password) { itsPassword = password; }
bool SendPassword();
void SetStatusUpdater(StatusUpdater, void *);
void SetErrorHandler(ErrorHandler, void *);
void UpdateStatus();
void UpdateStats();
bool UpdateDirectory(const std::string &);
void Play();
void Play(int);
void PlayID(int);
void Pause(bool);
void Toggle();
void Stop();
void Next();
void Prev();
bool Move(unsigned, unsigned);
void Swap(unsigned, unsigned);
void Seek(unsigned);
void Shuffle();
bool ClearMainPlaylist();
bool isPlaying() const { return GetState() > psStop; }
PlayerState GetState() const { return itsCurrentStatus ? PlayerState(mpd_status_get_state(itsCurrentStatus)) : psUnknown; }
PlayerState GetOldState() const { return itsOldStatus ? PlayerState(mpd_status_get_state(itsOldStatus)) : psUnknown; }
bool GetRepeat() const { return itsCurrentStatus ? mpd_status_get_repeat(itsCurrentStatus) : 0; }
bool GetRandom() const { return itsCurrentStatus ? mpd_status_get_random(itsCurrentStatus) : 0; }
bool GetSingle() const { return itsCurrentStatus ? mpd_status_get_single(itsCurrentStatus) : 0; }
bool GetConsume() const { return itsCurrentStatus ? mpd_status_get_consume(itsCurrentStatus) : 0; }
bool GetDBIsUpdating() const { return itsCurrentStatus ? mpd_status_get_update_id(itsCurrentStatus) : 0; }
int GetVolume() const { return itsCurrentStatus ? mpd_status_get_volume(itsCurrentStatus) : -1; }
unsigned GetCrossfade() const { return itsCurrentStatus ? mpd_status_get_crossfade(itsCurrentStatus) : 0; }
unsigned GetPlaylistID() const { return itsCurrentStatus ? mpd_status_get_queue_version(itsCurrentStatus) : 0; }
unsigned GetOldPlaylistID() const { return itsOldStatus ? mpd_status_get_queue_version(itsOldStatus) : 0; }
unsigned GetElapsedTime() const { return itsCurrentStatus ? itsElapsed : 0; }
int GetTotalTime() const { return itsCurrentStatus ? mpd_status_get_total_time(itsCurrentStatus) : 0; }
unsigned GetBitrate() const { return itsCurrentStatus ? mpd_status_get_kbit_rate(itsCurrentStatus) : 0; }
unsigned NumberOfArtists() const { return itsStats ? mpd_stats_get_number_of_artists(itsStats) : 0; }
unsigned NumberOfAlbums() const { return itsStats ? mpd_stats_get_number_of_albums(itsStats) : 0; }
unsigned NumberOfSongs() const { return itsStats ? mpd_stats_get_number_of_songs(itsStats) : 0; }
unsigned long Uptime() const { return itsStats ? mpd_stats_get_uptime(itsStats) : 0; }
unsigned long DBUpdateTime() const { return itsStats ? mpd_stats_get_db_update_time(itsStats) : 0; }
unsigned long PlayTime() const { return itsStats ? mpd_stats_get_play_time(itsStats) : 0; }
unsigned long DBPlayTime() const { return itsStats ? mpd_stats_get_db_play_time(itsStats) : 0; }
size_t GetPlaylistLength() const { return itsCurrentStatus ? mpd_status_get_queue_length(itsCurrentStatus) : 0; }
SongList GetPlaylistChanges(unsigned);
const std::string &GetErrorMessage() const { return itsErrorMessage; }
Song GetCurrentlyPlayingSong();
int GetCurrentlyPlayingSongPos() const;
int GetCurrentSongPos() const;
Song GetSong(const std::string &);
SongList GetPlaylistContent(const std::string &);
void GetSupportedExtensions(std::set<std::string> &);
void SetRepeat(bool);
void SetRandom(bool);
void SetSingle(bool);
void SetConsume(bool);
void SetCrossfade(unsigned);
void SetVolume(unsigned);
std::string GetReplayGainMode();
void SetReplayGainMode(ReplayGainMode);
bool SetPriority(const Song &s, int prio);
int AddSong(const std::string &, int = -1); // returns id of added song
int AddSong(const Song &, int = -1); // returns id of added song
bool AddRandomTag(mpd_tag_type, size_t);
bool AddRandomSongs(size_t);
bool Add(const std::string &path);
bool Delete(unsigned);
bool DeleteID(unsigned);
bool PlaylistDelete(const std::string &, unsigned);
void StartCommandsList();
bool CommitCommandsList();
bool DeletePlaylist(const std::string &);
bool LoadPlaylist(const std::string &name);
int SavePlaylist(const std::string &);
bool ClearPlaylist(const std::string &);
void AddToPlaylist(const std::string &, const Song &);
void AddToPlaylist(const std::string &, const std::string &);
bool PlaylistMove(const std::string &, int, int);
bool Rename(const std::string &, const std::string &);
void StartSearch(bool);
void StartFieldSearch(mpd_tag_type);
void AddSearch(mpd_tag_type, const std::string &) const;
void AddSearchAny(const std::string &str) const;
void AddSearchURI(const std::string &str) const;
SongList CommitSearchSongs();
StringList CommitSearchTags();
StringList GetPlaylists();
StringList GetList(mpd_tag_type);
ItemList GetDirectory(const std::string &);
SongList GetDirectoryRecursive(const std::string &);
SongList GetSongs(const std::string &);
StringList GetDirectories(const std::string &);
OutputList GetOutputs();
bool EnableOutput(int);
bool DisableOutput(int);
StringList GetURLHandlers();
StringList GetTagTypes();
private:
void GoIdle();
int GoBusy();
int CheckForErrors();
mpd_connection *itsConnection;
bool isCommandsListEnabled;
std::string itsErrorMessage;
int itsFD;
bool isIdle;
bool isIdleEnabled;
bool itsIdleBlocked;
bool supportsIdle;
bool hasData;
std::string itsHost;
int itsPort;
int itsTimeout;
std::string itsPassword;
mpd_status *itsCurrentStatus;
mpd_status *itsOldStatus;
mpd_stats *itsStats;
unsigned itsElapsed;
time_t itsElapsedTimer[2];
StatusChanges itsChanges;
StatusUpdater itsUpdater;
void *itsStatusUpdaterUserdata;
ErrorHandler itsErrorHandler;
void *itsErrorHandlerUserdata;
mpd_tag_type itsSearchedField;
};
}
extern MPD::Connection Mpd;