Moved definitions from screen.h to ncmpc.h

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1866 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/src/ncmpc.h b/src/ncmpc.h
index 019ce6893abf95f4b9745551ac19b3fca8ced00f..75fbf8e4a565ba18e8b20936b036313267176a2a 100644 (file)
--- a/src/ncmpc.h
+++ b/src/ncmpc.h
@@ -32,13 +32,20 @@ void D(char *format, ...);
 /* welcome message time [s] */
 #define SCREEN_WELCOME_TIME 10
 
+/* status message time [s] */
+#define SCREEN_STATUS_MESSAGE_TIME 3
+
 /* getch() timeout for non blocking read [ms] */
 #define SCREEN_TIMEOUT 500
 
-/* time in seconds between mpd updates (double) */
-#define MPD_UPDATE_TIME        0.5
+/* minumum window size */
+#define SCREEN_MIN_COLS 14
+#define SCREEN_MIN_ROWS  5
+
+/* time between mpd updates [s] */
+#define MPD_UPDATE_TIME 0.5
 
-/* time in milliseconds before trying to reconnect (int) */
+/* time before trying to reconnect [ms] */
 #define MPD_RECONNECT_TIME  1500
 
 /* song format - list window */

diff --git a/src/screen.h b/src/screen.h
index 8f95d7a86b5ae769dfba1c66d2baa270f0354012..fe6b394a33c814835e06256bcaa45632f95cf1a0 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -3,10 +3,6 @@
 #include <ncurses.h>
 #include "list_window.h"
 
-/* minumum window size */
-#define SCREEN_MIN_COLS 14
-#define SCREEN_MIN_ROWS  5
-
 #define IS_PLAYING(s) (s==MPD_STATUS_STATE_PLAY)
 #define IS_PAUSED(s) (s==MPD_STATUS_STATE_PAUSE)
 #define IS_STOPPED(s) (!(IS_PLAYING(s) | IS_PAUSED(s)))
@@ -34,7 +30,6 @@ typedef struct
 
   int cols, rows;
 
-  //screen_mode_t mode;
   int mode;
 
   char *buf;