X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_text.c;h=4117c919333468dd3d2e7c2ccef4b13af6e259aa;hb=57e189eb5d1d387f2036c31720e1e9aa8cb3ea78;hp=3350cb4a18830619ae223b5366553bc4355edb01;hpb=c36d3ca686c1152838674eba175823b33f36eeb1;p=vlc diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index 3350cb4a18..4117c91933 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -9,16 +9,15 @@ * 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. *****************************************************************************/ /***************************************************************************** @@ -213,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 ); } @@ -229,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 ); } @@ -240,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 */ @@ -321,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 ); }