# HG changeset patch # User ib # Date 1304433280 0 # Node ID 49ca38147d1f4ff11ec08051e336df120e49adeb # Parent 445a104bfb0f00e16a1f436698dcb0289a815691 Remove private symbolic constants from header files. These do not have to be defined outside the .c files. diff -r 445a104bfb0f -r 49ca38147d1f gui/mplayer/gui_common.c --- 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; diff -r 445a104bfb0f -r 49ca38147d1f gui/mplayer/gui_common.h --- 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 */ diff -r 445a104bfb0f -r 49ca38147d1f gui/skin/font.c --- 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) diff -r 445a104bfb0f -r 49ca38147d1f gui/skin/font.h --- 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