X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmpdclient.h;h=798e979c4d2bbcf73f006282b944627e71c97794;hb=ccc71047bee191463d8dffa0fd28bfb32984613e;hp=4723acfea191a3e526d3a1472743c30c78bac48a;hpb=0fbb0f08787d0b3716b28232c9091512b2f0224b;p=ncmpc.git diff --git a/src/mpdclient.h b/src/mpdclient.h index 4723acf..798e979 100644 --- a/src/mpdclient.h +++ b/src/mpdclient.h @@ -11,22 +11,39 @@ struct mpdclient { /* playlist */ struct mpdclient_playlist playlist; - /* Callbacks */ - GList *error_callbacks; - GList *playlist_callbacks; - GList *browse_callbacks; - struct mpd_connection *connection; + + /** + * If this object is non-NULL, it tracks idle events. It is + * automatically called by mpdclient_get_connection() and + * mpdclient_put_connection(). It is not created by the + * mpdclient library; the user of this library has to + * initialize it. However, it is freed when the MPD + * connection is closed. + */ + struct mpd_glib_source *source; + + /** + * This attribute is true when the connection is currently in + * "idle" mode, and the #mpd_glib_source waits for an event. + */ + bool idle; + struct mpd_status *status; const struct mpd_song *song; int volume; unsigned update_id; + + /** + * A bit mask of idle events occurred since the last update. + */ + enum mpd_idle events; }; /** functions ***************************************************************/ -gint +bool mpdclient_handle_error(struct mpdclient *c); struct mpdclient * @@ -40,9 +57,26 @@ mpdclient_is_connected(const struct mpdclient *c) return c->connection != NULL; } +G_GNUC_PURE +static inline bool +mpdclient_is_playing(const struct mpdclient *c) +{ + return c->status != NULL && + (mpd_status_get_state(c->status) == MPD_STATE_PLAY || + mpd_status_get_state(c->status) == MPD_STATE_PAUSE); +} + +static inline const struct mpd_song * +mpdclient_get_current_song(const struct mpdclient *c) +{ + return c->song != NULL && mpdclient_is_playing(c) + ? c->song + : NULL; +} + bool mpdclient_connect(struct mpdclient *c, const gchar *host, gint port, - gfloat timeout_, const gchar *password); + unsigned timeout_ms, const gchar *password); void mpdclient_disconnect(struct mpdclient *c); @@ -50,40 +84,50 @@ mpdclient_disconnect(struct mpdclient *c); bool mpdclient_update(struct mpdclient *c); +struct mpd_connection * +mpdclient_get_connection(struct mpdclient *c); + +void +mpdclient_put_connection(struct mpdclient *c); + +/** + * To be implemented by the application: mpdclient.c calls this to + * display an error message. + */ +void +mpdclient_ui_error(const char *message); /*** MPD Commands **********************************************************/ -gint mpdclient_cmd_play(struct mpdclient *c, gint index); -gint + +bool mpdclient_cmd_crop(struct mpdclient *c); -gint mpdclient_cmd_shuffle_range(struct mpdclient *c, guint start, guint end); -gint mpdclient_cmd_clear(struct mpdclient *c); -gint mpdclient_cmd_volume(struct mpdclient *c, gint value); -gint mpdclient_cmd_volume_up(struct mpdclient *c); -gint mpdclient_cmd_volume_down(struct mpdclient *c); -gint mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path); -gint mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song); -gint mpdclient_cmd_delete(struct mpdclient *c, gint index); -gint mpdclient_cmd_move(struct mpdclient *c, gint old_index, gint new_index); +bool +mpdclient_cmd_clear(struct mpdclient *c); -gint mpdclient_cmd_save_playlist(struct mpdclient *c, const gchar *filename); -gint mpdclient_cmd_load_playlist(struct mpdclient *c, const gchar *filename_utf8); -gint mpdclient_cmd_delete_playlist(struct mpdclient *c, const gchar *filename_utf8); +bool +mpdclient_cmd_volume(struct mpdclient *c, gint value); -/* list functions */ -GList *mpdclient_get_artists(struct mpdclient *c); -GList *mpdclient_get_albums(struct mpdclient *c, const gchar *artist_utf8); +bool +mpdclient_cmd_volume_up(struct mpdclient *c); +bool +mpdclient_cmd_volume_down(struct mpdclient *c); -/*** error callbacks *****************************************************/ +bool +mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path); -#define IS_ACK_ERROR(n) (n & MPD_ERROR_ACK) -#define GET_ACK_ERROR_CODE(n) ((n & 0xFF00) >> 8) +bool +mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song); -typedef void (*mpdc_error_cb_t) (struct mpdclient *c, gint error, const gchar *msg); +bool +mpdclient_cmd_delete(struct mpdclient *c, gint index); -void mpdclient_install_error_callback(struct mpdclient *c, mpdc_error_cb_t cb); -void mpdclient_remove_error_callback(struct mpdclient *c, mpdc_error_cb_t cb); +bool +mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end); + +bool +mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src); /*** playlist functions **************************************************/ @@ -95,60 +139,10 @@ mpdclient_playlist_update(struct mpdclient *c); bool mpdclient_playlist_update_changes(struct mpdclient *c); - -/*** mpdclient playlist callbacks *****************************************/ - -#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 - - -typedef void (*mpdc_list_cb_t) (struct mpdclient *c, int event, gpointer data); - -/* install a playlist callback function */ -void mpdclient_install_playlist_callback(struct mpdclient *c, mpdc_list_cb_t cb); - -/* remove a playlist callback function */ -void mpdclient_remove_playlist_callback(struct mpdclient *c, mpdc_list_cb_t cb); - - -/* issue a playlist callback */ -void mpdclient_playlist_callback(struct mpdclient *c, int event, gpointer data); - - -/*** filelist functions ***************************************************/ - -struct filelist * -mpdclient_filelist_get(struct mpdclient *c, const gchar *path); - -struct filelist * -mpdclient_filelist_search(struct mpdclient *c, int exact_match, - enum mpd_tag_type tag, - gchar *filter_utf8); - /* add all songs in filelist to the playlist */ -int +bool mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl); -/*** mpdclient browse callbacks ********************************************/ - -#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(struct mpdclient *c, mpdc_list_cb_t cb); - -/* remove a playlist callback function */ -void mpdclient_remove_browse_callback(struct mpdclient *c, mpdc_list_cb_t cb); - - -/* issue a playlist callback */ -void mpdclient_browse_callback(struct mpdclient *c, int event, gpointer data); - /* sort by list-format */ gint compare_filelistentry_format(gconstpointer filelist_entry1, gconstpointer filelist_entry2);