Bon, puisque �a semble commiter sous BeOS, je commite.

[vlc] / src / video_output / video_text.c

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index d21a5f430bb2c179feb98742090ab981b3da66c3..4117c919333468dd3d2e7c2ccef4b13af6e259aa 100644 (file)
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -9,29 +9,30 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "defs.h"
+
 #include <errno.h>                                                  /* errno */
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 #include <fcntl.h>                                                 /* open() */
 #include <unistd.h>                                       /* read(), close() */
 
-#include "common.h"
 #include "config.h"
+#include "common.h"
 #include "video_text.h"
 
 #include "intf_msg.h"
@@ -211,14 +212,14 @@ vout_font_t *vout_LoadFont( const char *psz_name )
     i_file = open( psz_name, O_RDONLY );
     if( i_file == -1 )
     {
-        intf_ErrMsg("error: can't open file '%s' (%s)\n", psz_name, strerror(errno));
+        intf_DbgMsg("vout: can't open file '%s' (%s)\n", psz_name, strerror(errno));
         return( NULL );
     }
 
     /* Read magick number */
     if( read( i_file, pi_buffer, 2 ) != 2 )
     {
-        intf_ErrMsg("error: unexpected end of file '%s'\n", psz_name );
+        intf_ErrMsg("vout error: unexpected end of file '%s'\n", psz_name );
         close( i_file );
         return( NULL );
     }
@@ -227,7 +228,7 @@ vout_font_t *vout_LoadFont( const char *psz_name )
     p_font = malloc( sizeof( vout_font_t ) );
     if( p_font == NULL )
     {
-        intf_ErrMsg("error: %s\n", strerror(ENOMEM));
+        intf_ErrMsg("vout error: %s\n", strerror(ENOMEM));
         close( i_file );
         return( NULL );
     }
@@ -238,7 +239,7 @@ vout_font_t *vout_LoadFont( const char *psz_name )
     case 0x3604:                                              /* .psf file */
         /*
          * PSF font: simple fixed font. Only the first 256 characters are read.
-         * Those fonts are always 1 byte width, and 256 or 512 characters long.
+         * Those fonts are always 1 byte wide, and 256 or 512 characters long.
          */
 
         /* Read font header - two bytes indicate the font properties */
@@ -319,7 +320,7 @@ vout_font_t *vout_LoadFont( const char *psz_name )
  *****************************************************************************/
 void vout_UnloadFont( vout_font_t *p_font )
 {
-    intf_DbgMsg( "font %p\n", p_font );
+    intf_DbgMsg( "vout: unloading font %p\n", p_font );
     free( p_font->p_data );
     free( p_font );
 }