Skip to content

V
vlc-1.1
Commit ca90f850 authored by Stéphane Borel's avatar Stéphane Borel
Browse files
Options

*Changed the level arg in intf_WarnMsg so that it is more logical: the 

level corresponds now to the nb of -v to display the message.

*added functionnal preference window in gnome: it changes the
envirronment variables

*added jump window in gnome to jump to a precise time.
parent fd1da66f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 801 additions and 240 deletions
include/config.h.in
View file @ ca90f850
......@@ -145,6 +145,7 @@
/* Default search path for interface file browser */
#define INTF_PATH_VAR "vlc_search_path"
#define INTF_PATH_DEFAULT ""
/*****************************************************************************
* Input thread configuration
......@@ -228,7 +229,7 @@
#define INPUT_SUBTITLE_VAR "vlc_input_subtitle"
/* VCD defaults */
#define INPUT_VVC_DEVICE_VAR "vlc_vcd_device"
#define INPUT_VCD_DEVICE_VAR "vlc_vcd_device"
#define INPUT_VCD_DEVICE_DEFAULT "/dev/cdrom"
/*****************************************************************************
......@@ -476,7 +477,7 @@
/* Interface warnig message level */
#define INTF_WARNING_VAR "vlc_warning_level"
#define INTF_WARNING_DEFAULT 12
#define INTF_WARNING_DEFAULT 0
/* Define to enable messages queues - disabling messages queue can be useful
* when debugging, since it allows messages which would not be printed
......@@ -512,7 +513,7 @@
/* Enqueue drag'n dropped item */
#define PLAYLIST_ENQUEUE_VAR "vlc_playlist_enqueue"
#define PLAYLIST_ENQUEUE_DZFAULT 0
#define PLAYLIST_ENQUEUE_DEFAULT 0
/* Loop on playlist end */
#define PLAYLIST_LOOP_VAR "vlc_playlist_loop"
......
plugins/dvd/dvd_css.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* dvd_css.c: Functions for DVD authentification and unscrambling
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_css.c,v 1.27 2001/05/02 20:01:44 sam Exp $
* $Id: dvd_css.c,v 1.28 2001/05/07 03:14:09 stef Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -108,17 +108,17 @@ int CSSInit( int i_fd, css_t * p_css )
return -1;
case 1:
intf_WarnMsg( 3, "css info: already authenticated" );
intf_WarnMsg( 2, "css info: already authenticated" );
return 0;
case 0:
intf_WarnMsg( 3, "css info: need to authenticate" );
intf_WarnMsg( 2, "css info: need to authenticate" );
}
/* Init sequence, request AGID */
for( i = 1; i < 4 ; ++i )
{
intf_WarnMsg( 3, "css info: requesting AGID %d", i );
intf_WarnMsg( 2, "css info: requesting AGID %d", i );
i_ret = ioctl_ReportAgid( i_fd, &i_agid );
......@@ -180,7 +180,7 @@ int CSSInit( int i_fd, css_t * p_css )
if( memcmp( p_css->disc.pi_key_check,
p_css->disc.pi_key1, KEY_SIZE ) == 0 )
{
intf_WarnMsg( 3, "css info: drive authentic, using variant %d", i);
intf_WarnMsg( 2, "css info: drive authentic, using variant %d", i);
p_css->disc.i_varient = i;
break;
}
......@@ -221,7 +221,7 @@ int CSSInit( int i_fd, css_t * p_css )
return -1;
}
intf_WarnMsg( 3, "css info: authentication established" );
intf_WarnMsg( 2, "css info: authentication established" );
memcpy( p_css->disc.pi_challenge, p_css->disc.pi_key1, KEY_SIZE );
memcpy( p_css->disc.pi_challenge+KEY_SIZE, p_css->disc.pi_key2, KEY_SIZE );
......@@ -229,7 +229,7 @@ int CSSInit( int i_fd, css_t * p_css )
CSSCryptKey( 2, p_css->disc.i_varient, p_css->disc.pi_challenge,
p_css->disc.pi_key_check );
intf_WarnMsg( 1, "css info: received session key" );
intf_WarnMsg( 2, "css info: received session key" );
if( i_agid < 0 )
{
......@@ -243,11 +243,11 @@ int CSSInit( int i_fd, css_t * p_css )
return -1;
case 1:
intf_WarnMsg( 3, "css info: already authenticated" );
intf_WarnMsg( 2, "css info: already authenticated" );
return 0;
case 0:
intf_WarnMsg( 3, "css info: need to get disc key" );
intf_WarnMsg( 2, "css info: need to get disc key" );
}
/* Get encrypted disc key */
......@@ -277,7 +277,7 @@ int CSSInit( int i_fd, css_t * p_css )
return -1;
case 1:
intf_WarnMsg( 3, "css info: successfully authenticated" );
intf_WarnMsg( 2, "css info: successfully authenticated" );
return 0;
case 0:
......@@ -374,7 +374,7 @@ int CSSGetKey( int i_fd, css_t * p_css )
if( !b_encrypted )
{
intf_WarnMsg( 3, "css warning: this file was _NOT_ encrypted!" );
intf_WarnMsg( 2, "css warning: this file was _NOT_ encrypted!" );
return 0;
}
......
plugins/dvd/dvd_ifo.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* dvd_ifo.c: Functions for ifo parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_ifo.c,v 1.24 2001/04/22 00:08:25 stef Exp $
* $Id: dvd_ifo.c,v 1.25 2001/05/07 03:14:09 stef Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -493,7 +493,7 @@ DumpBits( p_ifo, pi_buffer, &p_current, 2 );
p_ifo->vts.b_initialized = 0;
intf_WarnMsg( 1, "ifo info: vmg initialized" );
intf_WarnMsg( 2, "ifo info: vmg initialized" );
return 0;
}
......
plugins/dvd/input_dvd.c
View file @ ca90f850
......@@ -10,7 +10,7 @@
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.55 2001/05/06 18:32:30 stef Exp $
* $Id: input_dvd.c,v 1.56 2001/05/07 03:14:09 stef Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -600,7 +600,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
p_dvd->i_title_id =
vts.title_inf.p_title_start[p_dvd->i_vts_title-1].i_title_id;
intf_WarnMsg( 1, "dvd: title %d vts_title %d pgc %d",
intf_WarnMsg( 3, "dvd: title %d vts_title %d pgc %d",
p_dvd->i_title,
p_dvd->i_vts_title,
p_dvd->i_title_id );
......@@ -747,7 +747,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
for( i = 1 ; i <= vts.manager_inf.i_audio_nb ; i++ )
{
intf_WarnMsg( 1, "Audio %d: %x %x %x %x %x %x %x %x %x %x %x %x", i,
intf_WarnMsg( 5, "dvd info: audio %d: %x %x %x %x %x %x %x %x %x %x %x %x", i,
vts.manager_inf.p_audio_attr[i-1].i_num_channels,
vts.manager_inf.p_audio_attr[i-1].i_coding_mode,
vts.manager_inf.p_audio_attr[i-1].i_multichannel_extension,
......@@ -775,7 +775,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
vts.manager_inf.p_audio_attr[i-1].i_lang_code ) ) );
strcat( p_es->psz_desc, " (ac3)" );
intf_WarnMsg( 1, "dvd info: audio stream %d %s\t(0x%x)",
intf_WarnMsg( 3, "dvd info: audio stream %d %s\t(0x%x)",
i, p_es->psz_desc, i_id );
break;
......@@ -792,7 +792,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
vts.manager_inf.p_audio_attr[i-1].i_lang_code ) ) );
strcat( p_es->psz_desc, " (mpeg)" );
intf_WarnMsg( 1, "dvd info: audio stream %d %s\t(0x%x)",
intf_WarnMsg( 3, "dvd info: audio stream %d %s\t(0x%x)",
i, p_es->psz_desc, i_id );
break;
......@@ -809,7 +809,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
vts.manager_inf.p_audio_attr[i-1].i_lang_code ) ) );
strcat( p_es->psz_desc, " (lpcm)" );
intf_WarnMsg( 1, "dvd info: audio stream %d %s\t(0x%x)",
intf_WarnMsg( 3, "dvd info: audio stream %d %s\t(0x%x)",
i, p_es->psz_desc, i_id );
#else
i_id = 0;
......@@ -845,7 +845,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
p_es->i_cat = SPU_ES;
strcpy( p_es->psz_desc, Language( hton16(
vts.manager_inf.p_spu_attr[i-1].i_lang_code ) ) );
intf_WarnMsg( 1, "dvd info: spu stream %d %s\t(0x%x)",
intf_WarnMsg( 3, "dvd info: spu stream %d %s\t(0x%x)",
i, p_es->psz_desc, i_id );
/* The before the last spu has a 0x0 prefix */
......@@ -1277,7 +1277,7 @@ static void DVDSeek( input_thread_t * p_input, off_t i_off )
(off_t)( p_dvd->i_sector ) *DVD_LB_SIZE, SEEK_SET ) -
p_input->stream.p_selected_area->i_start;
/*
intf_WarnMsg( 1, "Program Cell: %d Cell: %d Chapter: %d",
intf_WarnMsg( 3, "Program Cell: %d Cell: %d Chapter: %d",
p_dvd->i_prg_cell, p_dvd->i_cell, p_dvd->i_chapter );
*/
......@@ -1312,7 +1312,7 @@ static int DVDFindCell( thread_dvd_data_t * p_dvd )
}
/*
intf_WarnMsg( 1, "FindCell: i_cell %d i_index %d found %d nb %d",
intf_WarnMsg( 3, "FindCell: i_cell %d i_index %d found %d nb %d",
p_dvd->i_cell,
p_dvd->i_prg_cell,
i_cell,
......@@ -1363,7 +1363,7 @@ static int DVDFindSector( thread_dvd_data_t * p_dvd )
#endif
/*
intf_WarnMsg( 1, "cell: %d sector1: 0x%x end1: 0x%x\n"
intf_WarnMsg( 3, "cell: %d sector1: 0x%x end1: 0x%x\n"
"index: %d sector2: 0x%x end2: 0x%x\n"
"category: 0x%x ilvu end: 0x%x vobu start 0x%x",
p_dvd->i_cell,
......@@ -1425,7 +1425,7 @@ static int DVDChooseAngle( thread_dvd_data_t * p_dvd )
case 0x5:
p_dvd->i_prg_cell += p_dvd->i_angle - 1;
p_dvd->i_angle_cell = 0;
// intf_WarnMsg( 1, "dvd info: choosing angle %d", p_dvd->i_angle );
// intf_WarnMsg( 3, "dvd info: choosing angle %d", p_dvd->i_angle );
break;
/* we exit a multi-angle section */
case 0x9:
......
plugins/fb/vout_fb.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* vout_fb.c: framebuffer video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: vout_fb.c,v 1.11 2001/05/06 04:32:02 sam Exp $
* $Id: vout_fb.c,v 1.12 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -334,7 +334,7 @@ static int vout_Manage( vout_thread_t *p_vout )
*/
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
intf_WarnMsg( 1, "vout: reinitializing framebuffer screen" );
intf_WarnMsg( 3, "vout: reinitializing framebuffer screen" );
p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
/* Destroy XImages to change their size */
......@@ -459,7 +459,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
/* FIXME: if the image is full-size, it gets cropped on the left
* because of the xres / xres_virtual slight difference */
intf_WarnMsg( 1, "vout: %ix%i (virtual %ix%i)",
intf_WarnMsg( 3, "vout: %ix%i (virtual %ix%i)",
p_vout->p_sys->var_info.xres,
p_vout->p_sys->var_info.yres,
p_vout->p_sys->var_info.xres_virtual,
......@@ -573,7 +573,7 @@ static int FBOpenDisplay( vout_thread_t *p_vout )
p_vout->p_sys->p_video );
}
intf_WarnMsg( 1, "framebuffer type=%d, visual=%d, ypanstep=%d, ywrap=%d, accel=%d",
intf_WarnMsg( 3, "framebuffer type=%d, visual=%d, ypanstep=%d, ywrap=%d, accel=%d",
fix_info.type, fix_info.visual, fix_info.ypanstep, fix_info.ywrapstep, fix_info.accel );
return( 0 );
}
......
plugins/gnome/gnome_callbacks.c
View file @ ca90f850
This diff is collapsed.
plugins/gnome/gnome_interface.c
View file @ ca90f850
This diff is collapsed.
plugins/gnome/gnome_playlist.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* gnome_playlist.c : Interface for the playlist dialog
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: gnome_playlist.c,v 1.1 2001/05/06 18:41:52 stef Exp $
* $Id: gnome_playlist.c,v 1.2 2001/05/07 03:14:09 stef Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
*
......@@ -455,7 +455,7 @@ void GnomeDropDataReceived( intf_thread_t * p_intf,
p_protocol = strncpy( p_protocol, p_string,
strstr( p_string, ":/" ) + 1 - p_string );
intf_WarnMsg( 1, "Protocol dropped is %s", p_protocol );
intf_WarnMsg( 4, "Protocol dropped is %s", p_protocol );
p_string += strlen( p_protocol );
/* Allowed things are proto: or proto:// */
......@@ -464,7 +464,7 @@ void GnomeDropDataReceived( intf_thread_t * p_intf,
/* eat one '/' */
p_string++;
}
intf_WarnMsg( 1, " Dropped %s", p_string );
intf_WarnMsg( 4, " Dropped %s", p_string );
}
else
{
......@@ -496,7 +496,7 @@ void GnomeDropDataReceived( intf_thread_t * p_intf,
/* lock the interface */
vlc_mutex_lock( &p_intf->change_lock );
intf_WarnMsg( 1, "List has %d elements", g_list_length( p_files ) );
intf_WarnMsg( 4, "List has %d elements", g_list_length( p_files ) );
GnomeAppendList( p_playlist, i_position, p_files );
/* get the CList and rebuild it. */
......@@ -572,7 +572,7 @@ GList * GnomeReadFiles( gchar * psz_fsname )
{
if( GnomeHasValidExtension( psz_fsname ) )
{
intf_WarnMsg( 3, "%s is a valid file. Stacking on the playlist",
intf_WarnMsg( 2, "%s is a valid file. Stacking on the playlist",
psz_fsname );
return g_list_append( NULL, g_strdup( psz_fsname ) );
}
......@@ -588,7 +588,7 @@ GList * GnomeReadFiles( gchar * psz_fsname )
DIR * p_current_dir = opendir( psz_fsname );
struct dirent * p_dir_content;
intf_WarnMsg( 3, "%s is a folder.", psz_fsname );
intf_WarnMsg( 2, "%s is a folder.", psz_fsname );
if( p_current_dir == NULL )
{
......
plugins/gnome/intf_gnome.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* intf_gnome.c: Gnome interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gnome.c,v 1.36 2001/05/06 18:32:30 stef Exp $
* $Id: intf_gnome.c,v 1.37 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -1143,7 +1143,7 @@ static gint GnomeModeManage( intf_thread_t * p_intf )
p_intf->p_input->stream.b_changed = 0;
p_intf->p_sys->b_mode_changed = 0;
intf_WarnMsg( 2,
intf_WarnMsg( 3,
"intf info: menus refreshed as stream has changed" );
#undef GETWIDGET
......
plugins/gnome/intf_gnome.glade
View file @ ca90f850
This diff is collapsed.
plugins/gtk/gtk_playlist.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* gtk_playlist.c : Interface for the playlist dialog
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: gtk_playlist.c,v 1.10 2001/04/28 03:36:25 sam Exp $
* $Id: gtk_playlist.c,v 1.11 2001/05/07 03:14:09 stef Exp $
*
* Authors: Pierre Baillet <oct@zoy.org>
*
......@@ -365,7 +365,7 @@ void on_generic_drop_data_received( intf_thread_t * p_intf,
sizeof(char));
protocol = strncpy( protocol, string, strstr( string, ":/") + 1 - string );
intf_WarnMsg(1,"Protocol dropped is %s",protocol);
intf_WarnMsg(4,"Protocol dropped is %s",protocol);
string += strlen(protocol) ;
/* Allowed things are proto: or proto:// */
......@@ -374,7 +374,7 @@ void on_generic_drop_data_received( intf_thread_t * p_intf,
/* eat one '/' */
string++;
}
intf_WarnMsg(1,"Dropped %s",string);
intf_WarnMsg(4,"Dropped %s",string);
}
else
......@@ -404,7 +404,7 @@ void on_generic_drop_data_received( intf_thread_t * p_intf,
{
/* lock the interface */
vlc_mutex_lock( &p_intf->change_lock );
intf_WarnMsg( 1, "List has %d elements",g_list_length( files ) );
intf_WarnMsg( 4, "List has %d elements",g_list_length( files ) );
intf_AppendList( p_playlist, position, files );
/* get the CList and rebuild it. */
......@@ -449,7 +449,7 @@ intf_readFiles( gchar * fsname )
{
if( hasValidExtension(fsname) )
{
intf_WarnMsg( 3, "%s is a valid file. Stacking on the playlist", fsname );
intf_WarnMsg( 2, "%s is a valid file. Stacking on the playlist", fsname );
return g_list_append( NULL, g_strdup(fsname) );
}
else
......@@ -464,7 +464,7 @@ intf_readFiles( gchar * fsname )
DIR * currentDir = opendir( fsname );
struct dirent * dirContent;
intf_WarnMsg( 3, "%s is a folder.", fsname );
intf_WarnMsg( 2, "%s is a folder.", fsname );
if( currentDir == NULL )
{
......
plugins/gtk/intf_gtk.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* intf_gtk.c: Gtk+ interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gtk.c,v 1.16 2001/05/06 18:32:30 stef Exp $
* $Id: intf_gtk.c,v 1.17 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -325,7 +325,7 @@ static gint GtkManage( gpointer p_data )
{
p_intf->p_sys->b_menus_update = 1;
p_intf->p_input->stream.b_changed = 0;
intf_WarnMsg( 2,
intf_WarnMsg( 3,
"Interface menus refreshed as stream has changed" );
}
......
plugins/macosx/aout_macosx.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* aout_darwin.c : Darwin audio output plugin
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: aout_macosx.c,v 1.1 2001/04/06 18:18:10 massiot Exp $
* $Id: aout_macosx.c,v 1.2 2001/05/07 03:14:09 stef Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
*
......@@ -220,7 +220,7 @@ static int aout_Open( aout_thread_t *p_aout )
#if WRITE_AUDIO_OUTPUT_TO_FILE
p_aout->p_sys->fd = open( "audio-darwin.pcm", O_RDWR|O_CREAT );
intf_WarnMsg( 1, "open(...) -> %d", p_aout->p_sys->fd );
intf_WarnMsg( 3, "open(...) -> %d", p_aout->p_sys->fd );
#endif
vlc_cond_init( &p_aout->p_sys->cond_sync );
......
plugins/mpeg/input_ps.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* input_ps.c: PS demux and packet management
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input_ps.c,v 1.20 2001/04/28 03:36:25 sam Exp $
* $Id: input_ps.c,v 1.21 2001/05/07 03:14:09 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
......@@ -432,7 +432,7 @@ static int PSRead( input_thread_t * p_input,
/* It is common for MPEG-1 streams to pad with zeros
* (although it is forbidden by the recommendation), so
* don't bother everybody in this case. */
intf_WarnMsg( 1, "Garbage at input (%.8x)", i_startcode );
intf_WarnMsg( 3, "Garbage at input (%.8x)", i_startcode );
}
while( (i_startcode & 0xFFFFFF00) != 0x100L )
......
plugins/qt/intf_qt.cpp
View file @ ca90f850
......@@ -2,7 +2,7 @@
* intf_qt.cpp: Qt interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_qt.cpp,v 1.5 2001/04/27 16:08:26 sam Exp $
* $Id: intf_qt.cpp,v 1.6 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -127,7 +127,7 @@ private slots:
void DateDisplay ( int );
void About ( void );
void Unimplemented( void ) { intf_WarnMsg( 3, "intf warning: "
void Unimplemented( void ) { intf_WarnMsg( 1, "intf warning: "
"unimplemented function" ); };
private:
......
plugins/sdl/vout_sdl.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_sdl.c,v 1.49 2001/05/06 18:32:30 stef Exp $
* $Id: vout_sdl.c,v 1.50 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
......@@ -239,7 +239,7 @@ static int vout_Init( vout_thread_t *p_vout )
main_GetIntVariable( VOUT_HEIGHT_VAR,VOUT_HEIGHT_DEFAULT ),
SDL_YV12_OVERLAY,
p_vout->p_sys->p_display );
intf_Msg( "vout: YUV acceleration %s",
intf_WarnMsg( 2, "vout: YUV acceleration %s",
p_overlay->hw_overlay ? "activated" : "unavailable !" );
p_vout->b_need_render = !p_overlay->hw_overlay;
......@@ -551,8 +551,8 @@ static void vout_Display( vout_thread_t *p_vout )
SDL_YV12_OVERLAY,
p_vout->p_sys->p_display
);
intf_Msg("vout: YUV acceleration %s",
p_vout->p_sys->p_overlay->hw_overlay
intf_WarnMsg( 2, "vout: YUV acceleration %s",
p_vout->p_sys->p_overlay->hw_overlay
? "activated" : "unavailable !" );
}
......
plugins/x11/vout_x11.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* vout_x11.c: X11 video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_x11.c,v 1.23 2001/05/06 18:32:30 stef Exp $
* $Id: vout_x11.c,v 1.24 2001/05/07 03:14:09 stef Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -530,7 +530,7 @@ static int vout_Manage( vout_thread_t *p_vout )
/* Other event */
else
{
intf_WarnMsg( 1, "vout: unhandled event %d received", xevent.type );
intf_WarnMsg( 3, "vout: unhandled event %d received", xevent.type );
}
}
......
plugins/x11/vout_xvideo.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* vout_xvideo.c: Xvideo video output display method
*****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: vout_xvideo.c,v 1.14 2001/05/06 18:32:30 stef Exp $
* $Id: vout_xvideo.c,v 1.15 2001/05/07 03:14:09 stef Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -480,7 +480,7 @@ static int vout_Manage( vout_thread_t *p_vout )
/* Other event */
else
{
intf_WarnMsg( 1, "%p -> unhandled event type %d received",
intf_WarnMsg( 3, "%p -> unhandled event type %d received",
p_vout, xevent.type );
}
}
......
src/ac3_decoder/ac3_decoder.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* ac3_decoder.c: core ac3 decoder
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: ac3_decoder.c,v 1.31 2001/05/06 04:32:02 sam Exp $
* $Id: ac3_decoder.c,v 1.32 2001/05/07 03:14:09 stef Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@zoy.org>
......@@ -69,7 +69,7 @@ int ac3_decode_frame (ac3dec_t * p_ac3dec, s16 * buffer)
if (parse_bsi (p_ac3dec))
{
intf_WarnMsg (1,"Error during ac3parsing");
intf_WarnMsg (3,"Error during ac3parsing");
parse_auxdata (p_ac3dec);
return 1;
}
......@@ -102,7 +102,7 @@ int ac3_decode_frame (ac3dec_t * p_ac3dec, s16 * buffer)
if (parse_audblk (p_ac3dec, i))
{
intf_WarnMsg (1,"Error during ac3audioblock");
intf_WarnMsg (3,"Error during ac3audioblock");
parse_auxdata (p_ac3dec);
return 1;
}
......@@ -114,7 +114,7 @@ int ac3_decode_frame (ac3dec_t * p_ac3dec, s16 * buffer)
if (exponent_unpack (p_ac3dec))
{
intf_WarnMsg (1,"Error during ac3unpack");
intf_WarnMsg (3,"Error during ac3unpack");
parse_auxdata (p_ac3dec);
return 1;
}
......
src/ac3_decoder/ac3_mantissa.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* ac3_mantissa.c: ac3 mantissa computation
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ac3_mantissa.c,v 1.26 2001/05/06 04:32:02 sam Exp $
* $Id: ac3_mantissa.c,v 1.27 2001/05/07 03:14:09 stef Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -291,7 +291,7 @@ static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithf
p_ac3dec->total_bits_read += 5;
if ((group_code = GetBits (&p_ac3dec->bit_stream,5)) > 26)
{
intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (1)" );
intf_WarnMsg ( 3, "ac3dec error: invalid mantissa (1)" );
return 0;
}
......@@ -312,7 +312,7 @@ static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithf
p_ac3dec->total_bits_read += 7;
if ((group_code = GetBits (&p_ac3dec->bit_stream,7)) > 124)
{
intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (2)" );
intf_WarnMsg ( 3, "ac3dec error: invalid mantissa (2)" );
return 0;
}
......@@ -327,7 +327,7 @@ static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithf
p_ac3dec->total_bits_read += 3;
if ((group_code = GetBits (&p_ac3dec->bit_stream,3)) > 6)
{
intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (3)" );
intf_WarnMsg ( 3, "ac3dec error: invalid mantissa (3)" );
return 0;
}
......@@ -343,7 +343,7 @@ static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithf
p_ac3dec->total_bits_read += 7;
if ((group_code = GetBits (&p_ac3dec->bit_stream,7)) > 120)
{
intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (4)" );
intf_WarnMsg ( 3, "ac3dec error: invalid mantissa (4)" );
return 0;
}
......@@ -357,7 +357,7 @@ static __inline__ float coeff_get_float (ac3dec_t * p_ac3dec, u16 bap, u16 dithf
p_ac3dec->total_bits_read += 4;
if ((group_code = GetBits (&p_ac3dec->bit_stream,4)) > 14)
{
intf_WarnMsg ( 1, "ac3dec error: invalid mantissa (5)" );
intf_WarnMsg ( 3, "ac3dec error: invalid mantissa (5)" );
return 0;
}
......
src/ac3_spdif/ac3_spdif.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* ac3_spdif.c: ac3 pass-through to external decoder with enabled soundcard
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ac3_spdif.c,v 1.4 2001/05/06 18:32:30 stef Exp $
* $Id: ac3_spdif.c,v 1.5 2001/05/07 03:14:09 stef Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
......@@ -134,7 +134,7 @@ static int InitThread( ac3_spdif_thread_t * p_spdif )
return -1;
}
intf_WarnMsg( 1, "spdif: aout fifo #%d created",
intf_WarnMsg( 3, "spdif: aout fifo #%d created",
p_spdif->p_aout_fifo->i_fifo );
/* Check stream properties */
......
src/audio_output/aout_ext-dec.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* aout_ext-dec.c : exported fifo management functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: aout_ext-dec.c,v 1.3 2001/05/06 18:32:30 stef Exp $
* $Id: aout_ext-dec.c,v 1.4 2001/05/07 03:14:09 stef Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
*
......@@ -56,7 +56,7 @@ aout_fifo_t * aout_CreateFifo( int i_type, int i_channels, long l_rate,
if( p_aout_bank->i_count == 0 )
{
intf_Msg( "aout: no aout present, spawning one" );
intf_WarnMsg( 1, "aout: no aout present, spawning one" );
p_aout = aout_CreateThread( NULL );
......
src/audio_output/aout_spdif.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* aout_spdif: ac3 passthrough output
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: aout_spdif.c,v 1.3 2001/05/06 18:32:30 stef Exp $
* $Id: aout_spdif.c,v 1.4 2001/05/07 03:14:09 stef Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -65,7 +65,7 @@ void aout_SpdifThread( aout_thread_t * p_aout )
memset( pi_blank, 0, sizeof(pi_blank) );
memcpy( pi_blank, pi_spdif_blank, sizeof(pi_spdif_blank) );
intf_WarnMsg( 1, "aout info: starting spdif output loop" );
intf_WarnMsg( 3, "aout info: starting spdif output loop" );
/* variable used to compute the nnumber of blank frames since the
* last significant frame */
......@@ -131,7 +131,7 @@ void aout_SpdifThread( aout_thread_t * p_aout )
}
}
intf_WarnMsg( 2, "aout info: exiting spdif loop" );
intf_WarnMsg( 3, "aout info: exiting spdif loop" );
return;
}
......
src/input/input.c
View file @ ca90f850
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.106 2001/05/06 18:32:30 stef Exp $
* $Id: input.c,v 1.107 2001/05/07 03:14:09 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -277,7 +277,7 @@ static void RunThread( input_thread_t *p_input )
{
/* End of file - we do not set b_die because only the
* interface is allowed to do so. */
intf_WarnMsg( 1, "input: EOF reached" );
intf_WarnMsg( 3, "input: EOF reached" );
p_input->b_eof = 1;
}
else
......@@ -506,7 +506,7 @@ void input_FileOpen( input_thread_t * p_input )
p_input->stream.p_selected_area->i_tell = 0;
vlc_mutex_unlock( &p_input->stream.stream_lock );
intf_Msg( "input: opening file `%s'", p_input->p_source );
intf_WarnMsg( 1, "input: opening file `%s'", p_input->p_source );
#ifndef WIN32
if( (p_input->i_handle = open( psz_name,
/*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) )
......@@ -527,7 +527,7 @@ void input_FileOpen( input_thread_t * p_input )
*****************************************************************************/
void input_FileClose( input_thread_t * p_input )
{
intf_Msg( "input: closing file `%s'", p_input->p_source );
intf_WarnMsg( 1, "input: closing file `%s'", p_input->p_source );
close( p_input->i_handle );
return;
......
src/input/input_clock.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* input_clock.c: Clock/System date convertions, stream management
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_clock.c,v 1.13 2001/04/29 14:52:42 stef Exp $
* $Id: input_clock.c,v 1.14 2001/05/07 03:14:09 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -167,7 +167,7 @@ void input_ClockManageRef( input_thread_t * p_input,
/* Stream discontinuity, for which we haven't received a
* warning from the stream control facilities (dd-edited
* stream ?). */
intf_WarnMsg( 3, "Clock gap, unexpected stream discontinuity" );
intf_WarnMsg( 1, "Clock gap, unexpected stream discontinuity" );
input_ClockInit( p_pgrm );
p_pgrm->i_synchro_state = SYNCHRO_START;
input_EscapeDiscontinuity( p_input, p_pgrm );
......
src/input/input_ext-intf.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* input_ext-intf.c: services to the interface
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input_ext-intf.c,v 1.22 2001/04/28 03:36:25 sam Exp $
* $Id: input_ext-intf.c,v 1.23 2001/05/07 03:14:09 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -152,7 +152,7 @@ void input_Seek( input_thread_t * p_input, off_t i_position )
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.p_selected_area->i_seek = i_position;
intf_WarnMsg( 1, "input: seeking position %lld/%lld (%s/%s)", i_position,
intf_WarnMsg( 3, "input: seeking position %lld/%lld (%s/%s)", i_position,
p_input->stream.p_selected_area->i_size,
input_OffsetToTime( p_input, psz_time1, i_position ),
input_OffsetToTime( p_input, psz_time2,
......@@ -271,14 +271,14 @@ int input_ChangeES( input_thread_t * p_input, es_descriptor_t * p_es,
input_UnselectES( p_input,
p_input->stream.pp_selected_es[i_index] );
input_SelectES( p_input, p_es );
intf_WarnMsg( 1, "input info: es selected -> %s (0x%x)",
intf_WarnMsg( 3, "input info: es selected -> %s (0x%x)",
p_es->psz_desc, p_es->i_id );
}
}
else
{
input_SelectES( p_input, p_es );
intf_WarnMsg( 1, "input info: es selected -> %s (0x%x)",
intf_WarnMsg( 3, "input info: es selected -> %s (0x%x)",
p_es->psz_desc, p_es->i_id );
}
}
......@@ -286,7 +286,7 @@ int input_ChangeES( input_thread_t * p_input, es_descriptor_t * p_es,
{
if( i_index != -1 )
{
intf_WarnMsg( 1, "input info: es unselected -> %s (0x%x)",
intf_WarnMsg( 3, "input info: es unselected -> %s (0x%x)",
p_input->stream.pp_selected_es[i_index]->psz_desc,
p_input->stream.pp_selected_es[i_index]->i_id );
......
src/input/mpeg_system.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* mpeg_system.c: TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: mpeg_system.c,v 1.53 2001/05/02 13:30:30 henri Exp $
* $Id: mpeg_system.c,v 1.54 2001/05/07 03:14:09 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -142,7 +142,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
if( MoveChunk( p_header, &p_data, &p_byte, PES_HEADER_SIZE )
!= PES_HEADER_SIZE )
{
intf_WarnMsg( 3, "PES packet too short to have a header" );
intf_WarnMsg( 1, "PES packet too short to have a header" );
p_input->pf_delete_pes( p_input->p_method_data, p_pes );
p_pes = NULL;
return;
......@@ -171,7 +171,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
{
/* PES_packet_length is set and != total received payload */
/* Warn the decoder that the data may be corrupt. */
intf_WarnMsg( 3, "PES sizes do not match : packet corrupted" );
intf_WarnMsg( 1, "PES sizes do not match : packet corrupted" );
}
switch( p_es->i_stream_id )
......@@ -202,7 +202,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
i_max_len = MoveChunk( p_full_header, &p_data, &p_byte, 12 );
if( i_max_len < 2 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-2 header" );
p_input->pf_delete_pes( p_input->p_method_data,
p_pes );
......@@ -219,7 +219,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
{
if( i_max_len < 7 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-2 header" );
p_input->pf_delete_pes( p_input->p_method_data,
p_pes );
......@@ -237,7 +237,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
{
if( i_max_len < 12 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-2 header" );
p_input->pf_delete_pes( p_input->p_method_data,
p_pes );
......@@ -268,7 +268,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
i_pes_header_size++;
if( MoveChunk( NULL, &p_data, &p_byte, 1 ) != 1 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-1 header" );
p_input->pf_delete_pes( p_input->p_method_data, p_pes );
p_pes = NULL;
......@@ -292,7 +292,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
i_pes_header_size += 2;
if( MoveChunk( NULL, &p_data, &p_byte, 2 ) != 2 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-1 header" );
p_input->pf_delete_pes( p_input->p_method_data, p_pes );
p_pes = NULL;
......@@ -312,7 +312,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
i_pes_header_size += 4;
if( MoveChunk( p_ts, &p_data, &p_byte, 5 ) != 5 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-1 header" );
p_input->pf_delete_pes( p_input->p_method_data, p_pes );
p_pes = NULL;
......@@ -330,7 +330,7 @@ void input_ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
i_pes_header_size += 5;
if( MoveChunk( p_ts, &p_data, &p_byte, 5 ) != 5 )
{
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"PES packet too short to have a MPEG-1 header" );
p_input->pf_delete_pes( p_input->p_method_data,
p_pes );
......@@ -816,7 +816,7 @@ void input_DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
if( MoveChunk( p_header, &p_data, &p_byte, 14 ) != 14 )
{
intf_WarnMsg( 3, "Packet too short to have a header" );
intf_WarnMsg( 1, "Packet too short to have a header" );
b_trash = 1;
break;
}
......@@ -841,7 +841,7 @@ void input_DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
if( MoveChunk( p_header, &p_data, &p_byte, 12 ) != 12 )
{
intf_WarnMsg( 3, "Packet too short to have a header" );
intf_WarnMsg( 1, "Packet too short to have a header" );
b_trash = 1;
break;
}
......@@ -886,7 +886,7 @@ void input_DemuxPS( input_thread_t * p_input, data_packet_t * p_data )
default:
/* This should not happen */
b_trash = 1;
intf_WarnMsg( 1, "Unwanted packet received with start code 0x%.8x",
intf_WarnMsg( 3, "Unwanted packet received with start code 0x%.8x",
i_code );
}
}
......@@ -1083,7 +1083,7 @@ void input_DemuxTS( input_thread_t * p_input, data_packet_t * p_data )
* draft. As there is nothing interesting in this packet
* (except PCR that have already been handled), we can trash
* the packet. */
intf_WarnMsg( 1,
intf_WarnMsg( 3,
"Packet without payload received by TS demux" );
b_trash = 1;
}
......@@ -1091,7 +1091,7 @@ void input_DemuxTS( input_thread_t * p_input, data_packet_t * p_data )
{
/* FIXME: this can never happen, can it ? --Meuuh */
/* Duplicate packet: mark it as being to be trashed. */
intf_WarnMsg( 1, "Duplicate packet received by TS demux" );
intf_WarnMsg( 3, "Duplicate packet received by TS demux" );
b_trash = 1;
}
else if( p_es_demux->i_continuity_counter == 0xFF )
......
src/interface/interface.c
View file @ ca90f850
......@@ -4,7 +4,7 @@
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: interface.c,v 1.76 2001/05/06 04:32:02 sam Exp $
* $Id: interface.c,v 1.77 2001/05/07 03:14:09 stef Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -124,7 +124,7 @@ intf_thread_t* intf_Create( void )
intf_LoadChannels( p_intf, main_GetPszVariable( INTF_CHANNELS_VAR,
INTF_CHANNELS_DEFAULT ));
intf_Msg("intf: interface initialized");
intf_WarnMsg( 1, "intf: interface initialized");
return( p_intf );
}
......
src/interface/intf_msg.c
View file @ ca90f850
......@@ -4,7 +4,7 @@
* interface, such as message output. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: intf_msg.c,v 1.33 2001/04/30 15:01:00 massiot Exp $
* $Id: intf_msg.c,v 1.34 2001/05/07 03:14:09 stef Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -227,7 +227,7 @@ void intf_WarnMsg( int i_level, char *psz_format, ... )
{
va_list ap;
if( i_level >= p_main->i_warning_level )
if( i_level <= p_main->i_warning_level )
{
va_start( ap, psz_format );
QueueMsg( p_main->p_msg, INTF_MSG_WARN, psz_format, ap );
......@@ -299,7 +299,7 @@ void intf_WarnMsgImm( int i_level, char *psz_format, ... )
{
va_list ap;
if( i_level >= p_main->i_warning_level )
if( i_level <= p_main->i_warning_level )
{
va_start( ap, psz_format );
QueueMsg( p_main->p_msg, INTF_MSG_WARN, psz_format, ap );
......
src/interface/intf_playlist.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* intf_playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_playlist.c,v 1.3 2001/04/08 07:24:47 stef Exp $
* $Id: intf_playlist.c,v 1.4 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -86,7 +86,7 @@ void intf_PlaylistInit ( playlist_t * p_playlist )
/* The playlist is empty */
p_playlist->p_item = NULL;
intf_WarnMsg( 1, "intf: playlist initialized" );
intf_WarnMsg( 3, "intf: playlist initialized" );
}
/*****************************************************************************
......@@ -132,7 +132,7 @@ int intf_PlaylistAdd( playlist_t * p_playlist, int i_pos,
p_item->i_status = 0;
p_item->psz_name = strdup( psz_item );
intf_WarnMsg( 1, "intf: added `%s' to playlist", psz_item );
intf_WarnMsg( 3, "intf: added `%s' to playlist", psz_item );
vlc_mutex_unlock( &p_playlist->change_lock );
......@@ -208,7 +208,7 @@ int intf_PlaylistDelete( playlist_t * p_playlist, int i_pos )
p_playlist->p_item = realloc( p_playlist->p_item,
p_playlist->i_size * sizeof( playlist_item_t ) );
intf_WarnMsg( 1, "intf: removed `%s' from playlist", psz_name );
intf_WarnMsg( 3, "intf: removed `%s' from playlist", psz_name );
/* Delete the item */
......@@ -242,7 +242,7 @@ void intf_PlaylistDestroy( playlist_t * p_playlist )
free( p_playlist );
intf_WarnMsg( 1, "intf: playlist destroyed" );
intf_WarnMsg( 3, "intf: playlist destroyed" );
}
/*****************************************************************************
......
src/interface/main.c
View file @ ca90f850
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: main.c,v 1.92 2001/05/06 04:32:02 sam Exp $
* $Id: main.c,v 1.93 2001/05/07 03:14:09 stef Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -474,7 +474,7 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
p_main->b_video = 1;
p_main->b_channels = 0;
p_main->i_warning_level = 4;
p_main->i_warning_level = 0;
/* Get the executable name (similar to the basename command) */
p_main->psz_arg0 = p_tmp = ppsz_argv[ 0 ];
......@@ -531,7 +531,7 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
return( -1 );
break;
case 'v': /* -v, --verbose */
p_main->i_warning_level--;
p_main->i_warning_level++;
break;
/* Interface warning messages level */
......
src/misc/modules.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* modules.c : Built-in and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.29 2001/05/06 04:32:02 sam Exp $
* $Id: modules.c,v 1.30 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -145,7 +145,7 @@ void module_InitBank( void )
psz_fullpath = *ppsz_path;
}
intf_WarnMsgImm( 3, "module: browsing `%s'", psz_fullpath );
intf_WarnMsgImm( 1, "module: browsing `%s'", psz_fullpath );
if( (dir = opendir( psz_fullpath )) )
{
......@@ -187,7 +187,7 @@ void module_InitBank( void )
}
#endif /* HAVE_DYNAMIC_PLUGINS */
intf_WarnMsg( 1, "module: module bank initialized" );
intf_WarnMsg( 3, "module: module bank initialized" );
return;
}
......@@ -263,7 +263,7 @@ void module_ManageBank( void )
}
else
{
intf_WarnMsg( 3, "module: hiding unused plugin module `%s'",
intf_WarnMsg( 1, "module: hiding unused plugin module `%s'",
p_module->psz_name );
HideModule( p_module );
......@@ -352,7 +352,7 @@ module_t * module_Need( int i_capabilities, void *p_data )
if( p_bestmodule != NULL )
{
intf_WarnMsg( 3, "module: locking module `%s'",
intf_WarnMsg( 1, "module: locking module `%s'",
p_bestmodule->psz_name );
}
......@@ -375,7 +375,7 @@ void module_Unneed( module_t * p_module )
* so there is no need to check the return value. */
UnlockModule( p_module );
intf_WarnMsg( 3, "module: unlocking module `%s'", p_module->psz_name );
intf_WarnMsg( 1, "module: unlocking module `%s'", p_module->psz_name );
/* We release the global lock */
vlc_mutex_unlock( &p_module_bank->lock );
......@@ -404,7 +404,7 @@ static int AllocatePluginModule( char * psz_filename )
if( module_load( psz_filename, &handle ) )
{
/* The plugin module couldn't be opened */
intf_WarnMsgImm( 3, "module warning: cannot open %s (%s)",
intf_WarnMsgImm( 1, "module warning: cannot open %s (%s)",
psz_filename, module_error() );
return( -1 );
}
......@@ -843,7 +843,7 @@ static int CallSymbol( module_t * p_module, char * psz_name )
if( !p_symbol )
{
/* We couldn't load the symbol */
intf_WarnMsg( 3, "module warning: "
intf_WarnMsg( 1, "module warning: "
"cannot find symbol %s in module %s (%s)",
psz_name, p_module->is.plugin.psz_filename,
module_error() );
......
src/spu_decoder/spu_decoder.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* spu_decoder.c : spu decoder thread
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: spu_decoder.c,v 1.40 2001/05/06 04:32:02 sam Exp $
* $Id: spu_decoder.c,v 1.41 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -159,7 +159,7 @@ static int InitThread( spudec_thread_t *p_spudec )
*****************************************************************************/
static void RunThread( spudec_thread_t *p_spudec )
{
intf_WarnMsg( 1, "spudec: spu decoder thread %i spawned", getpid() );
intf_WarnMsg( 3, "spudec: spu decoder thread %i spawned", getpid() );
/*
* Initialize thread and free configuration
......@@ -187,7 +187,7 @@ static void RunThread( spudec_thread_t *p_spudec )
}
/* End of thread */
intf_WarnMsg( 1, "spudec: destroying spu decoder thread %i", getpid() );
intf_WarnMsg( 3, "spudec: destroying spu decoder thread %i", getpid() );
EndThread( p_spudec );
}
......@@ -333,7 +333,7 @@ static void ParsePacket( spudec_thread_t *p_spudec )
return;
}
intf_WarnMsg( 1, "spudec: got a valid %ix%i subtitle at (%i,%i), "
intf_WarnMsg( 3, "spudec: got a valid %ix%i subtitle at (%i,%i), "
"RLE offsets: 0x%x 0x%x",
p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y,
p_spu->type.spu.i_offset[0], p_spu->type.spu.i_offset[1] );
......
src/video_output/video_output.c
View file @ ca90f850
......@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: video_output.c,v 1.124 2001/05/06 18:32:30 stef Exp $
* $Id: video_output.c,v 1.125 2001/05/07 03:14:10 stef Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -194,7 +194,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status )
p_vout->b_fullscreen = main_GetIntVariable( VOUT_FULLSCREEN_VAR,
VOUT_FULLSCREEN_DEFAULT );
intf_WarnMsg( 1, "wished configuration: %dx%d, %d/%d bpp (%d Bpl)",
intf_WarnMsg( 3, "wished configuration: %dx%d, %d/%d bpp (%d Bpl)",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
......@@ -232,7 +232,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status )
free( p_vout );
return( NULL );
}
intf_WarnMsg( 1, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
intf_WarnMsg( 3, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
"masks: 0x%x/0x%x/0x%x",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
......@@ -283,7 +283,7 @@ vout_thread_t * vout_CreateThread ( int *pi_status )
return( NULL );
}
intf_Msg( "vout: video display initialized (%dx%d, %d/%d bpp)",
intf_WarnMsg( 1, "vout: video display initialized (%dx%d, %d/%d bpp)",
p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8 );
......@@ -1049,7 +1049,7 @@ static void RunThread( vout_thread_t *p_vout)
p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_pictures--;
}
intf_WarnMsg( 3,
intf_WarnMsg( 1,
"warning: late picture skipped (%p)", p_pic );
vlc_mutex_unlock( &p_vout->picture_lock );
......
src/video_parser/vpar_headers.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_headers.c,v 1.86 2001/05/06 04:32:03 sam Exp $
* $Id: vpar_headers.c,v 1.87 2001/05/07 03:14:10 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -457,14 +457,14 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
if( p_vout_bank->i_count == 0 )
{
intf_Msg( "vpar: no vout present, spawning one" );
intf_WarnMsg( 1, "vpar: no vout present, spawning one" );
p_vpar->p_vout = vout_CreateThread( NULL );
/* Everything failed */
if( p_vpar->p_vout == NULL )
{
intf_Msg( "vpar: can't open vout, aborting" );
intf_ErrMsg( "vpar error: can't open vout, aborting" );
vlc_mutex_unlock( &p_vout_bank->lock );
/* XXX ! XXX ! XXX ! what to do here ? */
......
src/video_parser/vpar_synchro.c
View file @ ca90f850
......@@ -2,7 +2,7 @@
* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_synchro.c,v 1.89 2001/05/06 04:32:03 sam Exp $
* $Id: vpar_synchro.c,v 1.90 2001/05/07 03:14:10 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -265,7 +265,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
b_decode = (pts - now) > (TAU_PRIME(I_CODING_TYPE) + DELTA);
}
if( !b_decode )
intf_WarnMsg( 3, "vpar synchro warning: trashing I (%lld)",
intf_WarnMsg( 1, "vpar synchro warning: trashing I (%lld)",
pts - now);
break;
......@@ -460,7 +460,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
if( p_vpar->synchro.i_eta_p
&& p_vpar->synchro.i_eta_p != p_vpar->synchro.i_n_p )
{
intf_WarnMsg( 1, "Stream periodicity changed from P[%d] to P[%d]",
intf_WarnMsg( 3, "Stream periodicity changed from P[%d] to P[%d]",
p_vpar->synchro.i_n_p, p_vpar->synchro.i_eta_p );
p_vpar->synchro.i_n_p = p_vpar->synchro.i_eta_p;
}
......@@ -489,7 +489,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
if( p_vpar->synchro.i_eta_b
&& p_vpar->synchro.i_eta_b != p_vpar->synchro.i_n_b )
{
intf_WarnMsg( 1, "Stream periodicity changed from B[%d] to B[%d]",
intf_WarnMsg( 3, "Stream periodicity changed from B[%d] to B[%d]",
p_vpar->synchro.i_n_b, p_vpar->synchro.i_eta_b );
p_vpar->synchro.i_n_b = p_vpar->synchro.i_eta_b;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment