diff --git a/src/screen.h b/src/screen.h
index b20a6c9449f1a18459ae95fd7e7573833398b6b1..d0ae704a0ec845a57307a597055eb72adbb723a6 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
#include "title_bar.h"
#include "progress_bar.h"
#include "status_bar.h"
+#include "ncmpc_curses.h"
#include <mpd/client.h>
#include <glib.h>
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#else
-#include <ncurses.h>
-#endif
-
-#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 screen_functions;
struct screen {
struct title_bar title_bar;
struct progress_bar progress_bar;
struct status_bar status_bar;
- /* GTime is equivalent to time_t */
- GTime start_timestamp;
-
unsigned cols, rows;
char *buf;
char *findbuf;
GList *find_history;
+
+#ifndef NCMPC_MINI
+ /**
+ * Non-zero when the welcome message is currently being
+ * displayed. The associated timer will disable it.
+ */
+ guint welcome_source_id;
+#endif
};
extern struct screen screen;
-extern const struct screen_functions screen_playlist;
-extern const struct screen_functions screen_browse;
-#ifdef ENABLE_ARTIST_SCREEN
-extern const struct screen_functions screen_artist;
-#endif
-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
-
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(struct mpdclient *c);
void screen_update(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);
int
screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row);
-#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, bool follow);
-#endif
-
#endif