changeset 33269:49ca38147d1f

Remove private symbolic constants from header files. These do not have to be defined outside the .c files.
author ib
date Tue, 03 May 2011 14:34:40 +0000
parents 445a104bfb0f
children f9d3084f2e95
files gui/mplayer/gui_common.c gui/mplayer/gui_common.h gui/skin/font.c gui/skin/font.h
diffstat 4 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gui/mplayer/gui_common.c	Tue May 03 14:03:03 2011 +0000
+++ b/gui/mplayer/gui_common.c	Tue May 03 14:34:40 2011 +0000
@@ -35,6 +35,8 @@
 #include "osdep/timer.h"
 #include "stream/stream.h"
 
+#define DLABEL_DELAY 2500   // in milliseconds
+
 static char *image_buffer;
 static int image_width;
 
--- a/gui/mplayer/gui_common.h	Tue May 03 14:03:03 2011 +0000
+++ b/gui/mplayer/gui_common.h	Tue May 03 14:34:40 2011 +0000
@@ -21,8 +21,6 @@
 
 #include "gui/app.h"
 
-#define DLABEL_DELAY 2500   // in milliseconds
-
 void Render(wsTWindow *window, wItem *Items, int nrItems, char *db, int size);
 
 #endif /* MPLAYER_GUI_GUI_COMMON_H */
--- a/gui/skin/font.c	Tue May 03 14:03:03 2011 +0000
+++ b/gui/skin/font.c	Tue May 03 14:34:40 2011 +0000
@@ -30,6 +30,12 @@
 #include "libavutil/avstring.h"
 #include "mp_msg.h"
 
+#define MAX_FONTS 25
+
+#define fntAlignLeft   0
+#define fntAlignCenter 1
+#define fntAlignRight  2
+
 static bmpFont *Fonts[MAX_FONTS];
 
 static int fntAddNewFont(char *name)
--- a/gui/skin/font.h	Tue May 03 14:03:03 2011 +0000
+++ b/gui/skin/font.h	Tue May 03 14:34:40 2011 +0000
@@ -27,11 +27,6 @@
 #define UTF8LENGTH 4     // length of an UTF-8 encoding according to RFC 3629
 
 #define MAX_FONT_NAME 128
-#define MAX_FONTS 25
-
-#define fntAlignLeft   0
-#define fntAlignCenter 1
-#define fntAlignRight  2
 
 typedef struct {
     int x, y;     // location