[MPlayer-cvslog] r32929 - in trunk/gui/skin: font.c font.h

[ib]

Author: ib
Date: Sat Feb 19 13:50:54 2011
New Revision: 32929

Log:
Cosmetic: Limit scope of internal functions.

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

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Sat Feb 19 10:17:38 2011	(r32928)
+++ trunk/gui/skin/font.c	Sat Feb 19 13:50:54 2011	(r32929)
@@ -29,7 +29,7 @@
 
 bmpFont * Fonts[MAX_FONTS] = {0};
 
-int fntAddNewFont( char * name )
+static int fntAddNewFont( char * name )
 {
  int id, i;
 
@@ -155,7 +155,7 @@ int fntFindID( char * name )
 
 // get Fnt index of character (utf8 or normal one) *str points to,
 // then move pointer to next/previous character
-int fntGetCharIndex( int id, unsigned char **str, gboolean utf8, int direction )
+static int fntGetCharIndex( int id, unsigned char **str, gboolean utf8, int direction )
 {
  unsigned char *p, uchar[6] = "";   // glib implements 31-bit UTF-8
  int i, c = -1;
@@ -211,7 +211,7 @@ int fntTextWidth( int id,char * str )
  return size;
 }
 
-int fntTextHeight( int id,char * str )
+static int fntTextHeight( int id,char * str )
 {
  int max = 0;
  gboolean utf8;

Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h	Sat Feb 19 10:17:38 2011	(r32928)
+++ trunk/gui/skin/font.h	Sat Feb 19 13:50:54 2011	(r32929)
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_GUI_FONT_H
 #define MPLAYER_GUI_FONT_H
 
-#include <gtk/gtk.h>
 #include "gui/bitmap.h"
 #include "gui/app.h"
 
@@ -50,11 +49,8 @@ typedef struct
 
 extern bmpFont  * Fonts[MAX_FONTS];
 
-int  fntAddNewFont( char * name );
 void fntFreeFont( void );
 int  fntFindID( char * name );
-int  fntGetCharIndex( int id, unsigned char **str, gboolean utf8, int direction );
-int  fntTextHeight( int id, char * str );
 int  fntTextWidth( int id, char * str );
 
 int        fntRead( char * path, char * fname );