mpdclient: removed the mpdclient_t typedef

[ncmpc.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index 5d7737973d2d0649c994cf328f9edd4dde5d2967..b22eae455d93c194129c98ccdcaa2eba3374221b 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,10 +1,30 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef SCREEN_H
 #define SCREEN_H
 
 #include "config.h"
-#include "mpdclient.h"
 #include "command.h"
 
+#include <mpd/client.h>
+
 #include <glib.h>
 
 #ifdef HAVE_NCURSESW_NCURSES_H
@@ -13,12 +33,14 @@
 #include <ncurses.h>
 #endif
 
-#define IS_PLAYING(s) (s==MPD_STATUS_STATE_PLAY)
-#define IS_PAUSED(s) (s==MPD_STATUS_STATE_PAUSE)
+#define IS_PLAYING(s) (s==MPD_STATE_PLAY)
+#define IS_PAUSED(s) (s==MPD_STATE_PAUSE)
 #define IS_STOPPED(s) (!(IS_PLAYING(s) | IS_PAUSED(s)))
 
 #define MAX_SONGNAME_LENGTH   512
 
+struct mpdclient;
+
 struct window {
        WINDOW *w;
        unsigned rows, cols;
@@ -56,51 +78,66 @@ extern const struct screen_functions screen_help;
 #ifdef ENABLE_SEARCH_SCREEN
 extern const struct screen_functions screen_search;
 #endif
+#ifdef ENABLE_SONG_SCREEN
+extern const struct screen_functions screen_song;
+#endif
 #ifdef ENABLE_KEYDEF_SCREEN
 extern const struct screen_functions screen_keydef;
 #endif
 #ifdef ENABLE_LYRICS_SCREEN
 extern const struct screen_functions screen_lyrics;
 #endif
+#ifdef ENABLE_OUTPUTS_SCREEN
+extern const struct screen_functions screen_outputs;
+#endif
+
 
 typedef struct screen_functions {
        void (*init)(WINDOW *w, int cols, int rows);
        void (*exit)(void);
-       void (*open)(mpdclient_t *c);
+       void (*open)(struct mpdclient *c);
        void (*close)(void);
        void (*resize)(int cols, int rows);
        void (*paint)(void);
-       void (*update)(mpdclient_t *c);
-       bool (*cmd)(mpdclient_t *c, command_t cmd);
+       void (*update)(struct mpdclient *c);
+       bool (*cmd)(struct mpdclient *c, command_t cmd);
        const char *(*get_title)(char *s, size_t size);
 } screen_functions_t;
 
-void screen_init(mpdclient_t *c);
+void screen_init(struct mpdclient *c);
 void screen_exit(void);
 void screen_resize(struct mpdclient *c);
 void screen_status_message(const char *msg);
 void screen_status_printf(const char *format, ...);
 char *screen_error(void);
-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);
+void screen_paint(struct mpdclient *c);
+void screen_update(struct mpdclient *c);
+void screen_idle(struct mpdclient *c);
+void screen_cmd(struct mpdclient *c, command_t cmd);
 gint screen_get_id(const char *name);
 
 void
 screen_switch(const struct screen_functions *sf, struct mpdclient *c);
+void 
+screen_swap(struct mpdclient *c, const struct mpd_song *song);
 
 gboolean
 screen_is_visible(const struct screen_functions *sf);
 
-int screen_get_mouse_event(mpdclient_t *c, unsigned long *bstate, int *row);
+int
+screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row);
 
 bool
 screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song);
 
+#ifdef ENABLE_SONG_SCREEN
+void
+screen_song_switch(struct mpdclient *c, const struct mpd_song *song);
+#endif
+
 #ifdef ENABLE_LYRICS_SCREEN
 void
-screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song);
+screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song, bool follow);
 #endif
 
 #endif