(previous commit foired)

 . this is a coding style patch which removes all "foo(bar){" constructions
   and most of the tabulations.
 . also, fixed a bug in the default subtitle track.
 . and made a few error messages more explicit, ie. changed "error: %s" to
   "foo error: couldn't initialize bar (%s)"
 . and removed a warning in intf_ctrl.c which isn't used anyway.

plugins/sdl/vout_sdl.c

@@ -331,7 +331,7 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
         SDL_ShowCursor( 1 );
 
     SDL_WM_SetCaption( VOUT_TITLE , VOUT_TITLE );
-    SDL_EventState(SDL_KEYUP , SDL_IGNORE);	/* ignore keys up */
+    SDL_EventState(SDL_KEYUP , SDL_IGNORE); /* ignore keys up */
 
     if( p_vout->b_need_render )
     {
@@ -382,8 +382,8 @@ static int SDLOpenDisplay( vout_thread_t *p_vout )
 
     p_vout->i_changes |= VOUT_YUV_CHANGE;
 
-    /* Check buffers properties */	
-    p_vout->p_sys->b_must_acquire = 1;		/* always acquire */
+    /* Check buffers properties */
+    p_vout->p_sys->b_must_acquire = 1; /* always acquire */
 
     return( 0 );
 }

src/interface/intf_ctrl.c

@@ -498,8 +498,8 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv )
     p_main->p_intf->p_input = input_CreateThread( i_method, p_source, i_port, i_vlan_id,
                                                   p_main->p_intf->p_vout, p_main->p_aout,
                                                   NULL );
-    return( INTF_NO_ERROR );
 #endif
+    return( INTF_NO_ERROR );
 }
 
 /*****************************************************************************

src/lpcm_decoder/lpcm_decoder.h

@@ -24,9 +24,9 @@
 typedef struct lpcmdec_s lpcmdec_t;
 
 typedef struct lpcm_sync_info_s {
-    int sample_rate;	/* sample rate in Hz */
-    int frame_size;	/* frame size in bytes */
-    int bit_rate;	/* nominal bit rate in kbps */
+    int sample_rate;    /* sample rate in Hz */
+    int frame_size;     /* frame size in bytes */
+    int bit_rate;       /* nominal bit rate in kbps */
 } lpcm_sync_info_t;
 
 typedef struct lpcm_byte_stream_s {
@@ -57,7 +57,7 @@ struct lpcmdec_s {
      */
 
     /* The bit stream structure handles the PES stream at the bit level */
-    lpcm_bit_stream_t	bit_stream;
+    lpcm_bit_stream_t bit_stream;
 };
 
 

src/lpcm_decoder/lpcm_decoder_thread.c

@@ -2,7 +2,7 @@
  * lpcm_decoder_thread.c: lpcm decoder thread
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: lpcm_decoder_thread.c,v 1.7 2000/12/27 18:35:45 massiot Exp $
+ * $Id: lpcm_decoder_thread.c,v 1.8 2001/01/05 14:46:37 sam Exp $
  *
  * Authors:
  *
@@ -66,11 +66,11 @@ static void     EndThread               (lpcmdec_thread_t * p_adec);
 vlc_thread_t lpcmdec_CreateThread (adec_config_t * p_config)
 {
     lpcmdec_thread_t *   p_lpcmdec;
-    intf_DbgMsg ( "LPCM Debug: creating lpcm decoder thread" );
+    intf_DbgMsg ( "lpcm: creating lpcm decoder thread" );
 
     /* Allocate the memory needed to store the thread's structure */
     if ((p_lpcmdec = (lpcmdec_thread_t *)malloc (sizeof(lpcmdec_thread_t))) == NULL) {
-        intf_ErrMsg ( "LPCM Error: not enough memory for lpcmdec_CreateThread() to create the new thread" );
+        intf_ErrMsg ( "lpcm error: cannot create lpcmdec_thread_t" );
         return 0;
     }
 
@@ -92,7 +92,7 @@ vlc_thread_t lpcmdec_CreateThread (adec_config_t * p_config)
 
     /* Spawn the lpcm decoder thread */
     if (vlc_thread_create(&p_lpcmdec->thread_id, "lpcm decoder", (vlc_thread_func_t)RunThread, (void *)p_lpcmdec)) {
-        intf_ErrMsg  ( "LPCM Error: can't spawn lpcm decoder thread" );
+        intf_ErrMsg  ( "lpcm error: cannot spawn thread" );
         free (p_lpcmdec);
         return 0;
     }
@@ -171,38 +171,38 @@ static void RunThread (lpcmdec_thread_t * p_lpcmdec)
    
     while ((!p_lpcmdec->p_fifo->b_die) && (!p_lpcmdec->p_fifo->b_error))
     {
-	    s16 * buffer;
-	    lpcm_sync_info_t sync_info;
+        s16 * buffer;
+        lpcm_sync_info_t sync_info;
 
-	    if (!sync)
+        if (!sync)
         {
             /* have to find a synchro point */
         }
     
         if (DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts)
         {
-	        p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts;
-	        DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts = 0;
+            p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts;
+            DECODER_FIFO_START(*p_lpcmdec->p_fifo)->i_pts = 0;
         }
         else
         {
-	        p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = LAST_MDATE;
+            p_lpcmdec->p_aout_fifo->date[p_lpcmdec->p_aout_fifo->l_end_frame] = LAST_MDATE;
         }
 
-    	p_lpcmdec->p_aout_fifo->l_rate = sync_info.sample_rate;
+        p_lpcmdec->p_aout_fifo->l_rate = sync_info.sample_rate;
 
-	    buffer = ((s16 *)p_lpcmdec->p_aout_fifo->buffer) + (p_lpcmdec->p_aout_fifo->l_end_frame * LPCMDEC_FRAME_SIZE);
+        buffer = ((s16 *)p_lpcmdec->p_aout_fifo->buffer) + (p_lpcmdec->p_aout_fifo->l_end_frame * LPCMDEC_FRAME_SIZE);
 
-	    if (lpcm_decode_frame (&p_lpcmdec->lpcm_decoder, buffer))
+        if (lpcm_decode_frame (&p_lpcmdec->lpcm_decoder, buffer))
         {
-	        sync = 0;
-	        goto bad_frame;
-	    }
-
-	    vlc_mutex_lock (&p_lpcmdec->p_aout_fifo->data_lock);
-	    p_lpcmdec->p_aout_fifo->l_end_frame = (p_lpcmdec->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
-	    vlc_cond_signal (&p_lpcmdec->p_aout_fifo->data_wait);
-	    vlc_mutex_unlock (&p_lpcmdec->p_aout_fifo->data_lock);
+            sync = 0;
+            goto bad_frame;
+        }
+
+        vlc_mutex_lock (&p_lpcmdec->p_aout_fifo->data_lock);
+        p_lpcmdec->p_aout_fifo->l_end_frame = (p_lpcmdec->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
+        vlc_cond_signal (&p_lpcmdec->p_aout_fifo->data_wait);
+        vlc_mutex_unlock (&p_lpcmdec->p_aout_fifo->data_lock);
 
         intf_DbgMsg( "LPCM Debug: %x", *buffer );
         bad_frame:

src/lpcm_decoder/lpcm_decoder_thread.h

@@ -2,7 +2,7 @@
  * lpcm_decoder_thread.h : lpcm decoder thread interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: lpcm_decoder_thread.h,v 1.2 2000/12/21 13:25:51 massiot Exp $
+ * $Id: lpcm_decoder_thread.h,v 1.3 2001/01/05 14:46:37 sam Exp $
  *
  * Authors:
  *
@@ -37,7 +37,7 @@ typedef struct lpcmdec_thread_s
      */
     decoder_fifo_t *    p_fifo;                /* stores the PES stream data */
     data_packet_t *     p_data;
-    int               	sync_ptr;         /* sync ptr from lpcm magic header */
+    int                 sync_ptr;         /* sync ptr from lpcm magic header */
     adec_config_t *     p_config;
 
     /*

src/misc/mtime.c

@@ -94,7 +94,7 @@ mtime_t mdate( void )
 void mwait( mtime_t date )
 {
 #ifdef HAVE_KERNEL_OS_H
-	
+
     mtime_t delay;
     
     delay = date - real_time_clock_usecs();

src/misc/netutils.c

@@ -94,7 +94,7 @@ int BuildInetAddr( struct sockaddr_in *p_sa_in, char *psz_in_addr, int i_port )
         intf_DbgMsg("debug: resolving internet address %s...", psz_in_addr);
         if ( (p_hostent = gethostbyname(psz_in_addr)) == NULL)
         {
-            intf_ErrMsg("error: unknown host %s", psz_in_addr);
+            intf_ErrMsg( "net error: unknown host %s", psz_in_addr );
             return( -1 );
         }
 
@@ -158,8 +158,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
     }
     else
     {
-        intf_ErrMsg("Cannot read flags for interface %s: %s", psz_name,
-                    strerror(errno));
+        intf_ErrMsg( "net error: cannot read flags for interface %s (%s)",
+                     psz_name, strerror(errno) );
         return -1;
     }
 
@@ -182,8 +182,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
     }
     else
     {
-        intf_ErrMsg("Cannot read hardware address for interface %s: %s",
-                    psz_name, strerror(errno));
+        intf_ErrMsg( "net error: cannot read hardware address for %s (%s)",
+                     psz_name, strerror(errno) );
         return -1;
     }
 
@@ -197,8 +197,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
     }
     else
     {
-        intf_ErrMsg("Cannot read network address for interface %s: %s",
-                    psz_name, strerror(errno));
+        intf_ErrMsg( "net error: cannot read network address for %s (%s)",
+                     psz_name, strerror(errno) );
         return -1;
     }
 
@@ -221,8 +221,8 @@ int ReadIfConf(int i_sockfd, if_descr_t* p_ifdescr, char* psz_name)
     }
     else
     {
-        intf_ErrMsg("Cannot read broadcast address for interface %s: %s",
-                    psz_name, strerror(errno));
+        intf_ErrMsg( "net error: cannot read broadcast address for %s (%s)",
+                     psz_name, strerror(errno));
         return -1;
     }
 #endif
@@ -267,8 +267,8 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
         i_rc = ioctl(i_sockfd, SIOCGIFCONF, (byte_t*)&ifc_netconf);
         if( i_rc )
         {
-            intf_ErrMsg("Cannot read network configuration: %s",
-                        strerror(errno));
+            intf_ErrMsg( "net error: cannot read network configuration (%s)",
+                         strerror(errno));
             break;
         }
     }
@@ -298,8 +298,8 @@ int ReadNetConf(int i_sockfd, net_descr_t* p_net_descr)
             /* Read the status of this interface */
             if( ioctl(i_sockfd, SIOCGIFFLAGS, (byte_t *)p_ifr_current_if) < 0 )
             {
-                intf_ErrMsg("Cannot access interface %s: %s",
-                            p_ifr_current_if->ifr_name, strerror(errno));
+                intf_ErrMsg( "net error: cannot access interface %s (%s)",
+                             p_ifr_current_if->ifr_name, strerror(errno) );
                 i_rc = -1;
                 break;
             }

src/misc/playlist.c

@@ -54,14 +54,14 @@ playlist_t * playlist_Create ( void )
     p_playlist->i_index = 0;
     p_playlist->p_list = NULL;
 
-    intf_Msg("Playlist initialized");
+    intf_Msg("Playlist created");
     return( p_playlist );
 }
 
 void playlist_Init( playlist_t * p_playlist, int i_optind )
 {
     int i_list_index = 0;
-    int i_index = 0;
+    int i_index;
     int i_argc = p_main->i_argc;
 
     if( i_optind < i_argc )
@@ -70,11 +70,17 @@ void playlist_Init( playlist_t * p_playlist, int i_optind )
 
         p_playlist->p_list = malloc( i_list_index * sizeof( int ) );
 
-        while( i_argc - i_index > i_optind )
+        for( i_index = 0 ; i_argc - i_index > i_optind ; i_index++ )
         {
-            p_playlist->p_list[ i_index ] =
-                            p_main->ppsz_argv[ i_argc - i_index - 1];
-            i_index++;
+            if( strncmp( p_main->ppsz_argv[ i_argc - i_index - 1], "-", 1 ) )
+            {
+                p_playlist->p_list[ i_index ] =
+                                p_main->ppsz_argv[ i_argc - i_index - 1];
+            }
+            else
+            {
+                p_playlist->p_list[ i_index ] = "/dev/stdin";
+            }
         }
     }
     else

src/misc/plugins.c

@@ -115,6 +115,7 @@ void bank_Init( plugin_bank_t * p_bank )
     
     /* Dummy plugin */
     SEEK_PLUGIN( "dummy" );
+    SEEK_PLUGIN( "null" );
 
 #undef SEEK_PLUGIN
 }
@@ -190,7 +191,7 @@ char * TestPlugin ( plugin_id_t *p_plugin_id, char * psz_name )
         }
 
 #ifndef SYS_BEOS
-        intf_WarnMsg( 1, "Plugin %s failed: %s", psz_plugin, dlerror() );
+        intf_ErrMsg( "plugin error: cannot open %s (%s)", psz_plugin, dlerror() );
 #endif
 
         free( psz_plugin );

src/spu_decoder/spu_decoder.c

@@ -263,7 +263,7 @@ static void RunThread( spudec_thread_t *p_spudec )
                                 p_spu->i_height = p_spu->i_y - ( (i_word << 8)
                                     | GetByte( &p_spudec->bit_stream ) ) + 1;
 
-				i_index += 6;
+                                i_index += 6;
                                 break;
                             case SPU_CMD_SET_OFFSETS:
                                 /* 06xxxxyyyy (byte offsets) */

src/video_decoder/vdec_motion.c

@@ -2,7 +2,7 @@
  * vdec_motion.c : motion compensation routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion.c,v 1.33 2000/12/22 13:04:45 sam Exp $
+ * $Id: vdec_motion.c,v 1.34 2001/01/05 14:46:37 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Marc Dressler <polux@via.ecp.fr>
@@ -55,71 +55,71 @@
 #include "video_parser.h"
 #include "video_fifo.h"
 
-#define __MotionComponents(width,height)		\
-void MotionComponent_x_y_copy_##width##_##height ();	\
-void MotionComponent_X_y_copy_##width##_##height ();	\
-void MotionComponent_x_Y_copy_##width##_##height ();	\
-void MotionComponent_X_Y_copy_##width##_##height ();	\
-void MotionComponent_x_y_avg_##width##_##height ();	\
-void MotionComponent_X_y_avg_##width##_##height ();	\
-void MotionComponent_x_Y_avg_##width##_##height ();	\
+#define __MotionComponents(width,height)                \
+void MotionComponent_x_y_copy_##width##_##height ();    \
+void MotionComponent_X_y_copy_##width##_##height ();    \
+void MotionComponent_x_Y_copy_##width##_##height ();    \
+void MotionComponent_X_Y_copy_##width##_##height ();    \
+void MotionComponent_x_y_avg_##width##_##height ();     \
+void MotionComponent_X_y_avg_##width##_##height ();     \
+void MotionComponent_x_Y_avg_##width##_##height ();     \
 void MotionComponent_X_Y_avg_##width##_##height ();
 
-__MotionComponents (16,16)	/* 444, 422, 420 */
-__MotionComponents (16,8)	/* 444, 422, 420 */
-__MotionComponents (8,8)	/* 422, 420 */
-__MotionComponents (8,4)	/* 420 */
+__MotionComponents (16,16)        /* 444, 422, 420 */
+__MotionComponents (16,8)        /* 444, 422, 420 */
+__MotionComponents (8,8)        /* 422, 420 */
+__MotionComponents (8,4)        /* 420 */
 #if 0
-__MotionComponents (8,16)	/* 422 */
+__MotionComponents (8,16)        /* 422 */
 #endif
 
-#define ___callTheRightOne(width,height)				     \
-    if ((i_width == width) && (i_height == height))			     \
-    {									     \
-	if (!b_average)							     \
-	{								     \
-	    switch (i_select)						     \
-	    {								     \
-	    case 0:							     \
-		MotionComponent_x_y_copy_##width##_##height (p_src, p_dest,  \
-							     i_stride);	     \
-		break;							     \
-	    case 1:							     \
-		MotionComponent_X_y_copy_##width##_##height (p_src, p_dest,  \
-							     i_stride);	     \
-		break;							     \
-	    case 2:							     \
-		MotionComponent_x_Y_copy_##width##_##height (p_src, p_dest,  \
-							     i_stride);      \
-		break;							     \
-	    case 3:							     \
-		MotionComponent_X_Y_copy_##width##_##height (p_src, p_dest,  \
-							     i_stride);	     \
-		break;							     \
-	    }								     \
-	}								     \
-	else								     \
-	{								     \
-	    switch (i_select)						     \
-	    {								     \
-	    case 0:							     \
-		MotionComponent_x_y_avg_##width##_##height (p_src, p_dest,   \
-							    i_stride);	     \
-		break;							     \
-	    case 1:							     \
-		MotionComponent_X_y_avg_##width##_##height (p_src, p_dest,   \
-							    i_stride);	     \
-		break;							     \
-	    case 2:							     \
-		MotionComponent_x_Y_avg_##width##_##height (p_src, p_dest,   \
-							    i_stride);       \
-		break;							     \
-	    case 3:							     \
-		MotionComponent_X_Y_avg_##width##_##height (p_src, p_dest,   \
-							    i_stride);	     \
-		break;							     \
-	    }								     \
-	}								     \
+#define ___callTheRightOne(width,height)                                     \
+    if ((i_width == width) && (i_height == height))                          \
+    {                                                                        \
+        if (!b_average)                                                      \
+        {                                                                    \
+            switch (i_select)                                                \
+            {                                                                \
+            case 0:                                                          \
+                MotionComponent_x_y_copy_##width##_##height (p_src, p_dest,  \
+                                                             i_stride);      \
+                break;                                                       \
+            case 1:                                                          \
+                MotionComponent_X_y_copy_##width##_##height (p_src, p_dest,  \
+                                                             i_stride);      \
+                break;                                                       \
+            case 2:                                                          \
+                MotionComponent_x_Y_copy_##width##_##height (p_src, p_dest,  \
+                                                             i_stride);      \
+                break;                                                       \
+            case 3:                                                          \
+                MotionComponent_X_Y_copy_##width##_##height (p_src, p_dest,  \
+                                                             i_stride);      \
+                break;                                                       \
+            }                                                                \
+        }                                                                    \
+        else                                                                 \
+        {                                                                    \
+            switch (i_select)                                                \
+            {                                                                \
+            case 0:                                                          \
+                MotionComponent_x_y_avg_##width##_##height (p_src, p_dest,   \
+                                                            i_stride);       \
+                break;                                                       \
+            case 1:                                                          \
+                MotionComponent_X_y_avg_##width##_##height (p_src, p_dest,   \
+                                                            i_stride);       \
+                break;                                                       \
+            case 2:                                                          \
+                MotionComponent_x_Y_avg_##width##_##height (p_src, p_dest,   \
+                                                            i_stride);       \
+                break;                                                       \
+            case 3:                                                          \
+                MotionComponent_X_Y_avg_##width##_##height (p_src, p_dest,   \
+                                                            i_stride);       \
+                break;                                                       \
+            }                                                                \
+        }                                                                    \
     }
 
 /*****************************************************************************
@@ -136,12 +136,12 @@ static __inline__ void MotionComponent(
                     boolean_t b_average     /* (explicit) averaging of several
                                              * predictions */ )
 {
-___callTheRightOne (16,16)
-___callTheRightOne (16,8)
-___callTheRightOne (8,8)
-___callTheRightOne (8,4)
+    ___callTheRightOne (16,16)
+    ___callTheRightOne (16,8)
+    ___callTheRightOne (8,8)
+    ___callTheRightOne (8,4)
 #if 0
-___callTheRightOne (8,16)
+    ___callTheRightOne (8,16)
 #endif
 }
 
@@ -263,7 +263,7 @@ static __inline__ void Motion422(
                        + (p_mb->i_l_x + (i_mv_x >> 1))
                        + (p_mb->i_motion_l_y + i_offset
                           + b_source_field)
-		       * p_mb->p_picture->i_width
+                       * p_mb->p_picture->i_width
                        + (i_mv_y >> 1) * p_mb->i_l_stride,
                      /* destination */
                      p_mb->p_picture->p_y
@@ -671,7 +671,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
     MOTION( p_mb, p_mb->p_forward, 0, 0,                                \
             p_mb->pppi_motion_vectors[0][0][0],                         \
             p_mb->pppi_motion_vectors[0][0][1],                         \
-            /* XXX?? XXX?? >> 1 ? */                                        \
+            /* XXX?? XXX?? >> 1 ? */                                    \
             p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 );    \
                                                                         \
     /* predict and add to top field from bottom field */                \
@@ -683,7 +683,7 @@ void vdec_MotionFrameField444( macroblock_t * p_mb )
     MOTION( p_mb, p_mb->p_forward, 1, 1,                                \
             p_mb->pppi_motion_vectors[0][0][0],                         \
             p_mb->pppi_motion_vectors[0][0][1],                         \
-            /* XXX?? XXX?? >> 1 ? */                                        \
+            /* XXX?? XXX?? >> 1 ? */                                    \
             p_mb->i_l_stride << 1, p_mb->i_c_stride << 1, 8, 0, 0 );    \
                                                                         \
     /* predict and add to bottom field from top field */                \

src/video_decoder/vdec_motion_inner_mmx.c

@@ -3,7 +3,7 @@
  *                           MMX
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vdec_motion_inner_mmx.c,v 1.5 2000/12/21 17:19:52 massiot Exp $
+ * $Id: vdec_motion_inner_mmx.c,v 1.6 2001/01/05 14:46:37 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>, largerly inspired by the
  *          work done by the livid project <http://www.linuxvideo.org/>
@@ -487,10 +487,10 @@ __MotionComponent_X_y_avg(width,height)                                     \
 __MotionComponent_x_Y_avg(width,height)                                     \
 __MotionComponent_X_Y_avg(width,height)
 
-__MotionComponents (16,16)        /* 444, 422, 420 */
-__MotionComponents (16,8)        /* 444, 422, 420 */
+__MotionComponents (16,16)      /* 444, 422, 420 */
+__MotionComponents (16,8)       /* 444, 422, 420 */
 __MotionComponents (8,8)        /* 422, 420 */
 __MotionComponents (8,4)        /* 420 */
 #if 0
-__MotionComponents (8,16)        /* 422 */
+__MotionComponents (8,16)       /* 422 */
 #endif

src/video_output/video_output.c

@@ -104,7 +104,8 @@ vout_thread_t * vout_CreateThread   ( char *psz_display, int i_root_window,
     p_vout = (vout_thread_t *) malloc( sizeof(vout_thread_t) );
     if( p_vout == NULL )
     {
-        intf_ErrMsg( "vout error: %s", strerror(ENOMEM) );
+        intf_ErrMsg( "vout error: vout thread creation returned %s",
+                     strerror(ENOMEM) );
         return( NULL );
     }
 
@@ -460,7 +461,8 @@ subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type,
             p_free_subpic->i_type   =  EMPTY_SUBPICTURE;
             p_free_subpic->i_status =  FREE_SUBPICTURE;
             p_free_subpic =            NULL;
-            intf_ErrMsg("spu warning: %s", strerror( ENOMEM ) );
+            intf_ErrMsg( "vout error: spu allocation returned %s",
+                         strerror( ENOMEM ) );
         }
 
 #ifdef DEBUG_VOUT
@@ -698,7 +700,8 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type,
             p_free_picture->i_type   =  EMPTY_PICTURE;
             p_free_picture->i_status =  FREE_PICTURE;
             p_free_picture =            NULL;
-            intf_ErrMsg( "vout warning: %s", strerror( ENOMEM ) );
+            intf_ErrMsg( "vout error: picture allocation returned %s",
+                         strerror( ENOMEM ) );
         }
 
 #ifdef DEBUG_VOUT
@@ -929,7 +932,7 @@ static int InitThread( vout_thread_t *p_vout )
         /* Initialize convertion tables and functions */
         if( vout_InitYUV( p_vout ) )
         {
-            intf_ErrMsg("error: can't allocate YUV translation tables");
+            intf_ErrMsg("vout error: can't allocate YUV translation tables");
             return( 1 );
         }
     }
@@ -1142,7 +1145,6 @@ static void RunThread( vout_thread_t *p_vout)
                 
             } else {
                 /* no splash screen ! */
-                intf_ErrMsgImm("End of splash screen");  
                 p_vout->init_display_date=0;
             }
         }
@@ -2042,7 +2044,7 @@ static int Manage( vout_thread_t *p_vout )
     {
         if( vout_ResetYUV( p_vout ) )
         {
-            intf_ErrMsg("error: can't rebuild convertion tables");
+            intf_ErrMsg( "vout error: can't rebuild conversion tables" );
             return( 1 );
         }
     }
@@ -2058,7 +2060,7 @@ static int Manage( vout_thread_t *p_vout )
     {
         /* Some changes were not acknowledged by p_vout->p_sys_manage or this
          * function, it means they should not be authorized */
-        intf_ErrMsg( "error: unauthorized changes in the video output thread" );
+        intf_ErrMsg( "vout error: unauthorized changes in the vout thread" );
         return( 1 );
     }
 
@@ -2127,6 +2129,6 @@ static int Align( vout_thread_t *p_vout, int *pi_x, int *pi_y,
 static void     SetPalette        ( p_vout_thread_t p_vout, u16 *red,
                                     u16 *green, u16 *blue, u16 *transp )
 {
-    intf_ErrMsg( "SetPalette: method does not support palette changing" );
+    intf_ErrMsg( "vout error: method does not support palette changing" );
 }
 

src/video_output/video_text.c

@@ -228,7 +228,8 @@ vout_font_t *vout_LoadFont( const char *psz_name )
     p_font = malloc( sizeof( vout_font_t ) );
     if( p_font == NULL )
     {
-        intf_ErrMsg("vout error: %s", strerror(ENOMEM));
+        intf_ErrMsg( "vout error: cannot allocate vout_font_t (%s)",
+                     strerror(ENOMEM) );
         close( i_file );
         return( NULL );
     }
@@ -245,7 +246,7 @@ vout_font_t *vout_LoadFont( const char *psz_name )
         /* Read font header - two bytes indicate the font properties */
         if( read( i_file, pi_buffer, 2 ) != 2)
         {
-            intf_ErrMsg("error: unexpected end of file '%s'", psz_name );
+            intf_ErrMsg( "vout error: unexpected end of file '%s'", psz_name );
             free( p_font );
             close( i_file );
             return( NULL );
@@ -265,7 +266,8 @@ vout_font_t *vout_LoadFont( const char *psz_name )
         p_font->p_data = malloc( 2 * 256 * pi_buffer[1] );
         if( p_font->p_data == NULL )
         {
-            intf_ErrMsg("error: %s", strerror(ENOMEM));
+            intf_ErrMsg( "vout error: cannot allocate font space (%s)",
+                         strerror(ENOMEM) );
             free( p_font );
             close( i_file );
             return( NULL );
@@ -274,7 +276,7 @@ vout_font_t *vout_LoadFont( const char *psz_name )
         /* Copy raw data */
         if( read( i_file, p_font->p_data, 256 * pi_buffer[1] ) != 256 * pi_buffer[1] )
         {
-            intf_ErrMsg("error: unexpected end of file '%s'", psz_name );
+            intf_ErrMsg("vout error: unexpected end of file '%s'", psz_name );
             free( p_font->p_data );
             free( p_font );
             close( i_file );
@@ -300,7 +302,7 @@ vout_font_t *vout_LoadFont( const char *psz_name )
 
         break;
     default:
-        intf_ErrMsg("error: file '%s' has an unknown format", psz_name );
+        intf_ErrMsg("vout error: file '%s' has an unknown format", psz_name );
         free( p_font );
         close( i_file );
         return( NULL );