X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmpdclient.h;h=bac33383ab1bc33ccb34a614b5091fda8080f2cf;hb=86e6f3ac2a45025a7a66655eb0e406a02cee0769;hp=391a5d224576aa7b9f71975ba18f7fd7a2d99883;hpb=2c27ae895f99a3b925d37ae91725c400b85aac76;p=ncmpc.git diff --git a/src/mpdclient.h b/src/mpdclient.h index 391a5d2..bac3338 100644 --- a/src/mpdclient.h +++ b/src/mpdclient.h @@ -1,177 +1,210 @@ #ifndef MPDCLIENT_H #define MPDCLIENT_H -#include "libmpdclient.h" -/****************************************************************************/ -/* Playlist */ -/****************************************************************************/ +#include "playlist.h" +#include "Compiler.h" + +#include + +struct filelist; + +struct mpdclient { + const char *host; + unsigned port; + + unsigned timeout_ms; + + const char *password; + + /* playlist */ + struct mpdclient_playlist playlist; + + struct mpd_connection *connection; + + /** + * Tracks idle events. It is automatically called by + * mpdclient_get_connection(). + */ + struct mpd_glib_source *source; + + struct mpd_status *status; + const struct mpd_song *song; + + /** + * The GLib source id which re-enters MPD idle mode before the + * next main loop interation. + */ + unsigned enter_idle_source_id; + + /** + * This attribute is incremented whenever the connection changes + * (i.e. on disconnection and (re-)connection). + */ + unsigned connection_id; + + int volume; + + /** + * A bit mask of idle events occurred since the last update. + */ + enum mpd_idle events; + + /** + * This attribute is true when the connection is currently in + * "idle" mode, and the #mpd_glib_source waits for an event. + */ + bool idle; + + /** + * Is MPD currently playing? + */ + bool playing; +}; + +enum { + /** + * all idle events the version of libmpdclient, ncmpc is compiled + * against, supports + */ + MPD_IDLE_ALL = MPD_IDLE_DATABASE + | MPD_IDLE_STORED_PLAYLIST + | MPD_IDLE_QUEUE + | MPD_IDLE_PLAYER + | MPD_IDLE_MIXER + | MPD_IDLE_OUTPUT + | MPD_IDLE_OPTIONS + | MPD_IDLE_UPDATE + | MPD_IDLE_STICKER + | MPD_IDLE_SUBSCRIPTION + | MPD_IDLE_MESSAGE +}; -typedef struct +/** functions ***************************************************************/ + +bool +mpdclient_handle_error(struct mpdclient *c); + +static inline bool +mpdclient_finish_command(struct mpdclient *c) { - /* playlist id */ - long long id; - /* list length */ - guint length; - /* true if the list is updated */ - gboolean updated; - /* the list */ - GList *list; + return mpd_response_finish(c->connection) + ? true : mpdclient_handle_error(c); +} -} mpdclient_playlist_t; +struct mpdclient * +mpdclient_new(const gchar *host, unsigned port, + unsigned timeout_ms, const gchar *password); +void mpdclient_free(struct mpdclient *c); -typedef struct +gcc_pure +static inline bool +mpdclient_is_connected(const struct mpdclient *c) +{ + return c->connection != NULL; +} + +/** + * Is this object "dead"? i.e. not connected and not currently doing + * anything to connect. + */ +gcc_pure +static inline bool +mpdclient_is_dead(const struct mpdclient *c) { - guint flags; - mpd_InfoEntity *entity; -} filelist_entry_t; + return c->connection == NULL; +} -typedef struct +gcc_pure +static inline bool +mpdclient_is_playing(const struct mpdclient *c) { - /* path */ - gchar *path; - /* list length */ - guint length; - /* true if the list is updated */ - gboolean updated; - /* the list */ - GList *list; - -} mpdclient_filelist_t; - -typedef struct + return c->status != NULL && + (mpd_status_get_state(c->status) == MPD_STATE_PLAY || + mpd_status_get_state(c->status) == MPD_STATE_PAUSE); +} + +gcc_pure +static inline const struct mpd_song * +mpdclient_get_current_song(const struct mpdclient *c) { - /* playlist */ - mpdclient_playlist_t playlist; + return c->song != NULL && mpdclient_is_playing(c) + ? c->song + : NULL; +} - /* Callbacks */ - GList *error_callbacks; - GList *playlist_callbacks; - GList *browse_callbacks; +bool +mpdclient_connect(struct mpdclient *c); - mpd_Connection *connection; - mpd_Status *status; - mpd_Song *song; +void +mpdclient_disconnect(struct mpdclient *c); - gboolean need_update; - -} mpdclient_t; - -/** functions ***************************************************************/ -mpdclient_t *mpdclient_new(void); -mpdclient_t *mpdclient_free(mpdclient_t *c); -gint mpdclient_connect(mpdclient_t *c, gchar *host, gint port, - gfloat timeout, gchar *password); -gint mpdclient_disconnect(mpdclient_t *c); -gint mpdclient_update(mpdclient_t *c); +bool +mpdclient_update(struct mpdclient *c); +struct mpd_connection * +mpdclient_get_connection(struct mpdclient *c); /*** MPD Commands **********************************************************/ -gint mpdclient_cmd_play(mpdclient_t *c, gint index); -gint mpdclient_cmd_pause(mpdclient_t *c, gint value); -gint mpdclient_cmd_stop(mpdclient_t *c); -gint mpdclient_cmd_next(mpdclient_t *c); -gint mpdclient_cmd_prev(mpdclient_t *c); -gint mpdclient_cmd_seek(mpdclient_t *c, gint id, gint pos); -gint mpdclient_cmd_shuffle(mpdclient_t *c); -gint mpdclient_cmd_clear(mpdclient_t *c); -gint mpdclient_cmd_repeat(mpdclient_t *c, gint value); -gint mpdclient_cmd_random(mpdclient_t *c, gint value); -gint mpdclient_cmd_crossfade(mpdclient_t *c, gint value); -gint mpdclient_cmd_db_update(mpdclient_t *c); -gint mpdclient_cmd_volume(mpdclient_t *c, gint value); - -gint mpdclient_cmd_add(mpdclient_t *c, mpd_Song *song); -gint mpdclient_cmd_delete(mpdclient_t *c, gint index); -gint mpdclient_cmd_move(mpdclient_t *c, gint old_index, gint new_index); - -gint mpdclient_cmd_save_playlist(mpdclient_t *c, gchar *filename); -gint mpdclient_cmd_load_playlist(mpdclient_t *c, gchar *filename_utf8); -gint mpdclient_cmd_delete_playlist(mpdclient_t *c, gchar *filename_utf8); - - -/*** error callbacks *****************************************************/ - -#define IS_ACK_ERROR(n) (n & MPD_ERROR_ACK) -#define GET_ACK_ERROR_CODE(n) ((n & 0xFF00) >> 8) - -typedef void (*mpdc_error_cb_t) (mpdclient_t *c, gint error, gchar *msg); - -void mpdclient_install_error_callback(mpdclient_t *c, mpdc_error_cb_t cb); -void mpdclient_remove_error_callback(mpdclient_t *c, mpdc_error_cb_t cb); - -/*** playlist functions **************************************************/ - -/* free a playlist */ -gint mpdclient_playlist_free(mpdclient_playlist_t *playlist); -/* update the complete playlist */ -gint mpdclient_playlist_update(mpdclient_t *c); -/* get playlist changes */ -gint mpdclient_playlist_update_changes(mpdclient_t *c); - -GList *playlist_lookup(mpdclient_t *c, gint id); -mpd_Song *playlist_lookup_song(mpdclient_t *c, gint id); -mpd_Song *playlist_get_song(mpdclient_t *c, gint index); -gint playlist_get_index(mpdclient_t *c, mpd_Song *song); -gint playlist_get_index_from_id(mpdclient_t *c, gint id); -gint playlist_get_index_from_file(mpdclient_t *c, gchar *filename); +bool +mpdclient_cmd_crop(struct mpdclient *c); +bool +mpdclient_cmd_clear(struct mpdclient *c); -/*** mpdclient playlist callbacks *****************************************/ +bool +mpdclient_cmd_volume(struct mpdclient *c, gint value); -#define PLAYLIST_EVENT_UPDATED 0x01 -#define PLAYLIST_EVENT_CLEAR 0x02 -#define PLAYLIST_EVENT_DELETE 0x03 -#define PLAYLIST_EVENT_ADD 0x04 -#define PLAYLIST_EVENT_MOVE 0x05 +bool +mpdclient_cmd_volume_up(struct mpdclient *c); +bool +mpdclient_cmd_volume_down(struct mpdclient *c); -typedef void (*mpdc_list_cb_t) (mpdclient_t *c, int event, gpointer data); +bool +mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path); -/* install a playlist callback function */ -void mpdclient_install_playlist_callback(mpdclient_t *c, mpdc_list_cb_t cb); +bool +mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song); -/* remove a playlist callback function */ -void mpdclient_remove_playlist_callback(mpdclient_t *c, mpdc_list_cb_t cb); +bool +mpdclient_cmd_delete(struct mpdclient *c, gint index); +bool +mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end); -/* issue a playlist callback */ -void mpdclient_playlist_callback(mpdclient_t *c, int event, gpointer data); +bool +mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src); +bool +mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel); -/*** filelist functions ***************************************************/ -mpdclient_filelist_t *mpdclient_filelist_free(mpdclient_filelist_t *filelist); -mpdclient_filelist_t *mpdclient_filelist_get(mpdclient_t *c, gchar *path); -mpdclient_filelist_t *mpdclient_filelist_update(mpdclient_t *c, - mpdclient_filelist_t *flist); +bool +mpdclient_cmd_unsubscribe(struct mpdclient *c, const char *channel); -#define HIGHLIGHT (0x01) -void mpdclient_filelist_set_flags(mpdclient_filelist_t *flist, - mpd_Song *song, - guint flags); +bool +mpdclient_cmd_send_message(struct mpdclient *c, const char *channel, + const char *text); -void mpdclient_filelist_clear_flags(mpdclient_filelist_t *flist); -void mpdclient_filelist_clear_flags(mpdclient_filelist_t *flist); -filelist_entry_t *mpdclient_filelist_find_song(mpdclient_filelist_t *flist, - mpd_Song *song); +bool +mpdclient_send_read_messages(struct mpdclient *c); -/*** mpdclient browse callbacks ********************************************/ +struct mpd_message * +mpdclient_recv_message(struct mpdclient *c); -#define BROWSE_DB_UPDATED 0x01 -#define BROWSE_PLAYLIST_SAVED 0x02 -#define BROWSE_PLAYLIST_DELETED 0x03 - - -/* install a playlist callback function */ -void mpdclient_install_browse_callback(mpdclient_t *c, mpdc_list_cb_t cb); - -/* remove a playlist callback function */ -void mpdclient_remove_browse_callback(mpdclient_t *c, mpdc_list_cb_t cb); +/*** playlist functions **************************************************/ +/* update the complete playlist */ +bool +mpdclient_playlist_update(struct mpdclient *c); -/* issue a playlist callback */ -void mpdclient_browse_callback(mpdclient_t *c, int event, gpointer data); +/* get playlist changes */ +bool +mpdclient_playlist_update_changes(struct mpdclient *c); +/* add all songs in filelist to the playlist */ +bool +mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl); #endif