Major cleanup of the mpd client code (mpc->mpdclient)

[ncmpc.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index fe843daa6d2c14f524b69be1688374b237fda28b..262c6bd7edf4457d70b0d7d0546af7840fb269cb 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -63,12 +63,12 @@ typedef struct
 
 typedef void (*screen_init_fn_t)   (WINDOW *w, int cols, int rows);
 typedef void (*screen_exit_fn_t)   (void);
-typedef void (*screen_open_fn_t)   (screen_t *screen, mpd_client_t *c);
+typedef void (*screen_open_fn_t)   (screen_t *screen, mpdclient_t *c);
 typedef void (*screen_close_fn_t)  (void);
 typedef void (*screen_resize_fn_t)   (int cols, int rows);
-typedef void (*screen_paint_fn_t)  (screen_t *screen, mpd_client_t *c);
-typedef void (*screen_update_fn_t) (screen_t *screen, mpd_client_t *c);
-typedef int (*screen_cmd_fn_t) (screen_t *scr, mpd_client_t *c, command_t cmd);
+typedef void (*screen_paint_fn_t)  (screen_t *screen, mpdclient_t *c);
+typedef void (*screen_update_fn_t) (screen_t *screen, mpdclient_t *c);
+typedef int (*screen_cmd_fn_t) (screen_t *scr, mpdclient_t *c, command_t cmd);
 typedef char * (*screen_title_fn_t) (char *s, size_t size);
 typedef list_window_t * (*screen_get_lw_fn_t) (void);
 
@@ -88,15 +88,15 @@ typedef struct
 } screen_functions_t;
 
 
-int screen_init(void);
+int screen_init(mpdclient_t *c);
 int screen_exit(void);
 void screen_resize(void);
 void screen_status_message(char *msg);
 void screen_status_printf(char *format, ...);
 char *screen_error(void);
-void screen_paint(mpd_client_t *c);
-void screen_update(mpd_client_t *c);
-void screen_idle(mpd_client_t *c);
-void screen_cmd(mpd_client_t *c, command_t cmd);
+void screen_paint(mpdclient_t *c);
+void screen_update(mpdclient_t *c);
+void screen_idle(mpdclient_t *c);
+void screen_cmd(mpdclient_t *c, command_t cmd);
 
 #endif