Spelling corrections

[ncmpc.git] / src / mpdclient.h

diff --git a/src/mpdclient.h b/src/mpdclient.h
index f1b993756b2876d353838f6ff8e11fbc1466ce7f..fe13a2f8536c46ec4ea8e1e17663e789dcf7bddd 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -2,8 +2,8 @@
 #define MPDCLIENT_H
 
 #include "libmpdclient.h"
-
-#include <glib.h>
+#include "playlist.h"
+#include "filelist.h"
 
 #define MPD_VERSION_EQ(c,x,y,z) (c->connection->version[0] == x && \
                                  c->connection->version[1] == y && \
@@ -14,39 +14,6 @@
  (c->connection->version[0]==x && c->connection->version[1]==y && \
   c->connection->version[2]<z) )
 
-
-
-/****************************************************************************/
-/* Playlist */
-/****************************************************************************/
-
-typedef struct mpdclient_playlist {
-       /* playlist id */
-       long long id;
-       /* true if the list is updated */
-       gboolean updated;
-       /* the list */
-       GArray *list;
-
-} mpdclient_playlist_t;
-
-typedef struct filelist_entry {
-       guint flags;
-       mpd_InfoEntity *entity;
-} filelist_entry_t;
-
-typedef struct mpdclient_filelist {
-       /* path */
-       gchar *path;
-       /* list length */
-       guint length;
-       /* true if the list is updated */
-       gboolean updated;
-       /* the list */
-       GList *list;
-
-} mpdclient_filelist_t;
-
 typedef struct mpdclient {
        /* playlist */
        mpdclient_playlist_t playlist;
@@ -69,9 +36,9 @@ gint
 mpdclient_finish_command(mpdclient_t *c);
 
 mpdclient_t *mpdclient_new(void);
-mpdclient_t *mpdclient_free(mpdclient_t *c);
+void mpdclient_free(mpdclient_t *c);
 gint mpdclient_connect(mpdclient_t *c, gchar *host, gint port,
-                      gfloat timeout, gchar *password);
+                      gfloat timeout_, gchar *password);
 gint mpdclient_disconnect(mpdclient_t *c);
 gint mpdclient_update(mpdclient_t *c);
 
@@ -79,36 +46,36 @@ gint mpdclient_update(mpdclient_t *c);
 /*** MPD Commands  **********************************************************/
 gint mpdclient_cmd_play(mpdclient_t *c, gint index);
 gint mpdclient_cmd_pause(mpdclient_t *c, gint value);
+gint
+mpdclient_cmd_crop(mpdclient_t *c);
 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_shuffle_range(mpdclient_t *c, guint start, guint end);
 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_utf8(mpdclient_t *c, gchar *path);
+gint mpdclient_cmd_db_update(mpdclient_t *c, gchar *path);
 gint mpdclient_cmd_volume(mpdclient_t *c, gint value);
 gint mpdclient_cmd_add_path(mpdclient_t *c, gchar *path);
-gint mpdclient_cmd_add_path_utf8(mpdclient_t *c, gchar *path);
 
 gint mpdclient_cmd_add(mpdclient_t *c, struct 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_save_playlist_utf8(mpdclient_t *c, gchar *filename);
-gint mpdclient_cmd_load_playlist_utf8(mpdclient_t *c, gchar *filename_utf8);
-gint mpdclient_cmd_delete_playlist(mpdclient_t *c, gchar *filename);
-gint mpdclient_cmd_delete_playlist_utf8(mpdclient_t *c, gchar *filename_utf8);
+gint mpdclient_cmd_load_playlist(mpdclient_t *c, gchar *filename_utf8);
+gint mpdclient_cmd_delete_playlist(mpdclient_t *c, gchar *filename_utf8);
 
 /* list functions */
-GList *mpdclient_get_artists_utf8(mpdclient_t *c);
-GList *mpdclient_get_albums_utf8(mpdclient_t *c, gchar *artist_utf8);
+GList *mpdclient_get_artists(mpdclient_t *c);
+GList *mpdclient_get_albums(mpdclient_t *c, gchar *artist_utf8);
 
 
-/*** error callbacks *****************************************************/ 
+/*** error callbacks *****************************************************/
 
 #define IS_ACK_ERROR(n)       (n & MPD_ERROR_ACK)
 #define GET_ACK_ERROR_CODE(n) ((n & 0xFF00) >> 8)
@@ -120,19 +87,11 @@ 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);
-
-struct mpd_song *playlist_lookup_song(mpdclient_t *c, gint id);
-struct mpd_song *playlist_get_song(mpdclient_t *c, gint index);
-gint playlist_get_index(mpdclient_t *c, struct 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);
+gint mpdclient_playlist_update(struct mpdclient *c);
 
+/* get playlist changes */
+gint mpdclient_playlist_update_changes(struct mpdclient *c);
 
 
 /*** mpdclient playlist callbacks *****************************************/
@@ -158,29 +117,15 @@ void mpdclient_playlist_callback(mpdclient_t *c, int event, gpointer data);
 
 
 /*** filelist functions  ***************************************************/
-mpdclient_filelist_t *mpdclient_filelist_free(mpdclient_filelist_t *filelist);
+
 mpdclient_filelist_t *mpdclient_filelist_get(mpdclient_t *c, const gchar *path);
-mpdclient_filelist_t *mpdclient_filelist_search(mpdclient_t *c, 
+mpdclient_filelist_t *mpdclient_filelist_search(mpdclient_t *c,
                                                int exact_match,
                                                int table,
-                                               gchar *path);
-mpdclient_filelist_t *mpdclient_filelist_search_utf8(mpdclient_t *c, 
-                                                    int exact_match,
-                                                    int table,
-                                                    gchar *path);
-mpdclient_filelist_t *mpdclient_filelist_update(mpdclient_t *c, 
+                                               gchar *filter_utf8);
+mpdclient_filelist_t *mpdclient_filelist_update(mpdclient_t *c,
                                                mpdclient_filelist_t *flist);
 
-#define HIGHLIGHT  (0x01)
-void mpdclient_filelist_set_flags(mpdclient_filelist_t *flist, 
-                                 struct mpd_song *song,
-                                 guint flags);
-
-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,
-                                              struct mpd_song *song);
-
 /* add all songs in filelist to the playlist */
 int mpdclient_filelist_add_all(mpdclient_t *c, mpdclient_filelist_t *fl);