[MPlayer-cvslog] r33356 - in trunk/gui: mplayer/gui_common.c mplayer/gui_common.h skin/font.c skin/font.h

[ib]

Author: ib
Date: Tue May  3 16:34:40 2011
New Revision: 33356

Log:
Remove private symbolic constants from header files.

These do not have to be defined outside the .c files.

Modified:
   trunk/gui/mplayer/gui_common.c
   trunk/gui/mplayer/gui_common.h
   trunk/gui/skin/font.c
   trunk/gui/skin/font.h

Modified: trunk/gui/mplayer/gui_common.c
==============================================================================
--- trunk/gui/mplayer/gui_common.c	Tue May  3 16:03:03 2011	(r33355)
+++ trunk/gui/mplayer/gui_common.c	Tue May  3 16:34:40 2011	(r33356)
@@ -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;
 

Modified: trunk/gui/mplayer/gui_common.h
==============================================================================
--- trunk/gui/mplayer/gui_common.h	Tue May  3 16:03:03 2011	(r33355)
+++ trunk/gui/mplayer/gui_common.h	Tue May  3 16:34:40 2011	(r33356)
@@ -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 */

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Tue May  3 16:03:03 2011	(r33355)
+++ trunk/gui/skin/font.c	Tue May  3 16:34:40 2011	(r33356)
@@ -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)

Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h	Tue May  3 16:03:03 2011	(r33355)
+++ trunk/gui/skin/font.h	Tue May  3 16:34:40 2011	(r33356)
@@ -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