screen_song: make Path a proper label

[ncmpc.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index 245be7782f195285f827b5fae8468ddfbfc7568a..d0ae704a0ec845a57307a597055eb72adbb723a6 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,5 +1,5 @@
 /* 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
@@ -26,17 +26,12 @@
 #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
-
 struct mpdclient;
 struct screen_functions;
 
@@ -46,9 +41,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;
@@ -56,6 +48,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;
@@ -63,8 +63,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);