screen_search: revert label to "Filename"

[ncmpc.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index 17fc3d46d14691b7a27c30a9fc7db2ee0b2f89e5..0180e146308f4e0107042e2349bcba86199dfbcd 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -37,12 +37,6 @@
 #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;
 
@@ -52,9 +46,6 @@ struct screen {
        struct progress_bar progress_bar;
        struct status_bar status_bar;
 
-       /* GTime is equivalent to time_t */
-       GTime start_timestamp;
-
        unsigned cols, rows;
 
        char *buf;
@@ -62,6 +53,14 @@ struct screen {
 
        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;
@@ -69,8 +68,6 @@ extern struct screen screen;
 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, ...);
 void screen_paint(struct mpdclient *c);
 void screen_update(struct mpdclient *c);
 void screen_cmd(struct mpdclient *c, command_t cmd);