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.
/* Default search path for interface file browser */
#define INTF_PATH_VAR "vlc_search_path"
+#define INTF_PATH_DEFAULT ""
/*****************************************************************************
* Input thread configuration
#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"
/*****************************************************************************
/* 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
/* 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"
* 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: Stéphane Borel <stef@via.ecp.fr>
*
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 );
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;
}
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 );
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 )
{
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 */
return -1;
case 1:
- intf_WarnMsg( 3, "css info: successfully authenticated" );
+ intf_WarnMsg( 2, "css info: successfully authenticated" );
return 0;
case 0:
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;
}
* 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: Stéphane Borel <stef@via.ecp.fr>
*
p_ifo->vts.b_initialized = 0;
- intf_WarnMsg( 1, "ifo info: vmg initialized" );
+ intf_WarnMsg( 2, "ifo info: vmg initialized" );
return 0;
}
* -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: Stéphane Borel <stef@via.ecp.fr>
*
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 );
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,
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;
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;
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;
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 */
(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 );
*/
}
/*
-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,
#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,
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:
* 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>
*
*/
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 */
/* 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,
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 );
}
* gnome_callbacks.c : Callbacks for the Gnome plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gnome_callbacks.c,v 1.26 2001/05/06 18:32:30 stef Exp $
+ * $Id: gnome_callbacks.c,v 1.27 2001/05/07 03:14:09 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
/* get rid of ' ' at the end */
*( psz_text + i_len - 1 ) = 0;
- intf_WarnMsg( 1, "intf: dropped text/uri-list data `%s'", psz_text );
+ intf_WarnMsg( 3, "intf: dropped text/uri-list data `%s'", psz_text );
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_text );
break;
/* get rid of \r\n at the end */
*( psz_text + i_len - 2 ) = 0;
- intf_WarnMsg( 1, "intf: dropped text/uri-list data `%s'", psz_text );
+ intf_WarnMsg( 3, "intf: dropped text/uri-list data `%s'", psz_text );
intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_text );
break;
p_intf->p_sys->p_fileopen = create_intf_fileopen();
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_fileopen ),
"p_intf", p_intf );
+
+ gtk_file_selection_set_filename ( GTK_FILE_SELECTION(
+ p_intf->p_sys->p_fileopen ),
+ main_GetPszVariable( INTF_PATH_VAR, INTF_PATH_DEFAULT ) );
}
gtk_widget_show( p_intf->p_sys->p_fileopen );
p_intf->p_sys->p_preferences = create_intf_preferences();
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_preferences ),
"p_intf", p_intf );
+#if 1
+#define ASSIGN_PSZ_ENTRY( var, default, name ) \
+ gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data( GTK_OBJECT( \
+ p_intf->p_sys->p_preferences ), name ) ), \
+ main_GetPszVariable( var, default ) )
+
+#define ASSIGN_INT_VALUE( var, default, name ) \
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( gtk_object_get_data( \
+ GTK_OBJECT( p_intf->p_sys->p_preferences ), name ) ), \
+ main_GetIntVariable( var, default ) )
+
+#define ASSIGN_INT_TOGGLE( var, default, name ) \
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( gtk_object_get_data( \
+ GTK_OBJECT( p_intf->p_sys->p_preferences ), name ) ), \
+ main_GetIntVariable( var, default ) )
+
+ /* Default path */
+ ASSIGN_PSZ_ENTRY( INTF_PATH_VAR, INTF_PATH_DEFAULT,
+ "preferences_file_entry" );
+
+ /* Default DVD */
+ ASSIGN_PSZ_ENTRY( INPUT_DVD_DEVICE_VAR,INPUT_DVD_DEVICE_DEFAULT,
+ "preferences_disc_dvd_entry" );
+
+ /* Default VCD */
+ ASSIGN_PSZ_ENTRY( INPUT_VCD_DEVICE_VAR, INPUT_VCD_DEVICE_DEFAULT,
+ "preferences_disc_vcd_entry" );
+
+ /* Default server */
+ ASSIGN_PSZ_ENTRY( INPUT_SERVER_VAR, INPUT_SERVER_DEFAULT,
+ "preferences_network_server_entry" );
+
+ /* Default port */
+ ASSIGN_INT_VALUE( INPUT_PORT_VAR, INPUT_PORT_DEFAULT,
+ "preferences_network_port_spinbutton" );
+
+ /* Broadcast address */
+ ASSIGN_PSZ_ENTRY( INPUT_BCAST_ADRR_VAR, INPUT_BCAST_ADDR_DEFAULT,
+ "preferences_network_broadcast_entry" );
+
+ /* Broadcast stream by default ? */
+ ASSIGN_INT_TOGGLE( INPUT_BROADCAST_VAR, INPUT_BROADCAST_DEFAULT,
+ "preferences_network_broadcast_checkbutton" );
+
+ /* XXX Protocol */
+
+ /* Default interface */
+ ASSIGN_PSZ_ENTRY( INTF_METHOD_VAR, INTF_METHOD_DEFAULT,
+ "preferences_interface_entry" );
+
+ /* Default video output */
+ ASSIGN_PSZ_ENTRY( VOUT_METHOD_VAR, VOUT_METHOD_DEFAULT,
+ "preferences_video_output_entry" );
+
+ /* Default output width */
+ ASSIGN_INT_VALUE( VOUT_WIDTH_VAR, VOUT_WIDTH_DEFAULT,
+ "preferences_video_width_spinbutton" );
+
+ /* Default output height */
+ ASSIGN_INT_VALUE( VOUT_HEIGHT_VAR, VOUT_HEIGHT_DEFAULT,
+ "preferences_video_height_spinbutton" );
+
+ /* XXX Default screen depth */
+
+ /* XXX Default fullscreen depth */
+
+ /* XXX Default gamma */
+
+ /* Fullscreen on play */
+ ASSIGN_INT_TOGGLE( VOUT_FULLSCREEN_VAR, VOUT_FULLSCREEN_DEFAULT,
+ "preferences_video_fullscreen_checkbutton" );
+
+ /* Grayscale display */
+ ASSIGN_INT_TOGGLE( VOUT_GRAYSCALE_VAR, VOUT_GRAYSCALE_DEFAULT,
+ "preferences_video_grayscale_checkbutton" );
+
+ /* Default audio output */
+ ASSIGN_PSZ_ENTRY( AOUT_METHOD_VAR, AOUT_METHOD_DEFAULT,
+ "preferences_audio_output_entry" );
+
+ /* Default audio device */
+ ASSIGN_PSZ_ENTRY( AOUT_DSP_VAR, AOUT_DSP_DEFAULT,
+ "preferences_audio_device_entry" );
+
+ /* XXX Default frequency */
+
+ /* XXX Default quality */
+
+ /* XXX Default number of channels */
+
+ /* Use spdif output ? */
+ ASSIGN_INT_TOGGLE( AOUT_SPDIF_VAR, AOUT_SPDIF_DEFAULT,
+ "preferences_audio_spdif_checkbutton" );
+
+ /* Launch playlist on startup */
+ ASSIGN_INT_TOGGLE( PLAYLIST_STARTUP_VAR, PLAYLIST_STARTUP_DEFAULT,
+ "preferences_playlist_launch_on_startup_checkbutton" );
+
+ /* Enqueue drag'n dropped item as default */
+ ASSIGN_INT_TOGGLE( PLAYLIST_ENQUEUE_VAR, PLAYLIST_ENQUEUE_DEFAULT,
+ "preferences_playlist_enqueue_as_default_checkbutton" );
+
+ /* Loop on playlist end */
+ ASSIGN_INT_TOGGLE( PLAYLIST_LOOP_VAR, PLAYLIST_LOOP_DEFAULT,
+ "preferences_playlist_loop_checkbutton" );
+
+ /* Verbosity of warning messages */
+ ASSIGN_INT_VALUE( INTF_WARNING_VAR, INTF_WARNING_DEFAULT,
+ "preferences_misc_messages_spinbutton" );
+#undef ASSIGN_PSZ_ENTRY
+#undef ASSIGN_INT_VALUE
+#undef ASSIGN_INT_TOGGLE
+#endif
}
gtk_widget_show( p_intf->p_sys->p_preferences );
p_intf->p_sys->p_fileopen = create_intf_fileopen();
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_fileopen ),
"p_intf", p_intf );
+
+ if( main_GetPszVariable( INTF_PATH_VAR, INTF_PATH_DEFAULT ) != NULL )
+ {
+ gtk_file_selection_set_filename( GTK_FILE_SELECTION(
+ p_intf->p_sys->p_fileopen ),
+ main_GetPszVariable( INTF_PATH_VAR, INTF_PATH_DEFAULT ) );
+ }
}
gtk_widget_show( p_intf->p_sys->p_fileopen );
p_intf->p_sys->p_fileopen = create_intf_fileopen();
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_fileopen ),
"p_intf", p_intf );
+
+ if( main_GetPszVariable( INTF_PATH_VAR, INTF_PATH_DEFAULT ) != NULL )
+ {
+ gtk_file_selection_set_filename( GTK_FILE_SELECTION(
+ p_intf->p_sys->p_fileopen ),
+ main_GetPszVariable( INTF_PATH_VAR, INTF_PATH_DEFAULT ) );
+ }
}
gtk_widget_show( p_intf->p_sys->p_fileopen );
on_jump_ok_clicked (GtkButton *button,
gpointer user_data)
{
+ on_jump_apply_clicked( button, user_data );
gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
}
on_jump_apply_clicked (GtkButton *button,
gpointer user_data)
{
+#if 1
+ intf_thread_t * p_intf;
+ off_t i_seek;
+ off_t i_size;
+ int i_hours;
+ int i_minutes;
+ int i_seconds;
+
+ p_intf = GetIntf( GTK_WIDGET( button ), "intf_jump" );
+
+#define GET_VALUE( name ) \
+ gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( gtk_object_get_data( \
+ GTK_OBJECT( p_intf->p_sys->p_jump ), name ) ) )
+
+ i_hours = GET_VALUE( "jump_hour_spinbutton" );
+ i_minutes = GET_VALUE( "jump_minute_spinbutton" );
+ i_seconds = GET_VALUE( "jump_second_spinbutton" );
+#undef GET_VALUE
+
+ i_seconds += 60 *i_minutes + 3600* i_hours;
+
+ vlc_mutex_lock( &p_intf->p_input->stream.stream_lock );
+ i_seek = i_seconds * 50 * p_intf->p_input->stream.i_mux_rate;
+ i_size = p_intf->p_input->stream.p_selected_area->i_size;
+ vlc_mutex_unlock( &p_intf->p_input->stream.stream_lock );
+
+ if( i_seek < i_size )
+ {
+ input_Seek( p_intf->p_input, i_seek );
+ }
+#endif
}
on_preferences_ok_clicked (GtkButton *button,
gpointer user_data)
{
+ on_preferences_apply_clicked( button, user_data );
gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
}
on_preferences_apply_clicked (GtkButton *button,
gpointer user_data)
{
+#if 1
+ GtkWidget * p_preferences;
+
+ /* get preferences window */
+ p_preferences = gtk_widget_get_toplevel( GTK_WIDGET( button ) );
+
+#define ASSIGN_PSZ_ENTRY( var, name ) \
+ main_PutPszVariable( var, gtk_entry_get_text( \
+ GTK_ENTRY( gtk_object_get_data( GTK_OBJECT( p_preferences ), name ) ) ) )
+
+#define ASSIGN_INT_VALUE( var, name ) \
+ main_PutIntVariable( var, gtk_spin_button_get_value_as_int( \
+ GTK_SPIN_BUTTON( gtk_object_get_data( GTK_OBJECT( p_preferences ), \
+ name ) ) ) )
+
+#define ASSIGN_INT_TOGGLE( var, name ) \
+ main_PutIntVariable( var, gtk_toggle_button_get_active( \
+ GTK_TOGGLE_BUTTON( gtk_object_get_data( GTK_OBJECT( p_preferences ), \
+ name ) ) ) )
+
+ /* Default path */
+ ASSIGN_PSZ_ENTRY( INTF_PATH_VAR, "preferences_file_entry" );
+
+ /* Default DVD */
+ ASSIGN_PSZ_ENTRY( INPUT_DVD_DEVICE_VAR, "preferences_disc_dvd_entry" );
+
+ /* Default VCD */
+ ASSIGN_PSZ_ENTRY( INPUT_VCD_DEVICE_VAR, "preferences_disc_vcd_entry" );
+
+ /* Default server */
+ ASSIGN_PSZ_ENTRY( INPUT_SERVER_VAR, "preferences_network_server_entry" );
+
+ /* Default port */
+ ASSIGN_INT_VALUE( INPUT_PORT_VAR, "preferences_network_port_spinbutton" );
+
+ /* Broadcast address */
+ ASSIGN_PSZ_ENTRY( INPUT_BCAST_ADRR_VAR,
+ "preferences_network_broadcast_entry" );
+
+ /* Broadcast stream by default ? */
+ ASSIGN_INT_TOGGLE( INPUT_BROADCAST_VAR,
+ "preferences_network_broadcast_checkbutton" );
+
+ /* XXX Protocol */
+
+ /* Default interface */
+ ASSIGN_PSZ_ENTRY( INTF_METHOD_VAR, "preferences_interface_entry" );
+ /* Default video output */
+ ASSIGN_PSZ_ENTRY( VOUT_METHOD_VAR, "preferences_video_output_entry" );
+
+ /* Default output width */
+ ASSIGN_INT_VALUE( VOUT_WIDTH_VAR, "preferences_video_width_spinbutton" );
+
+ /* Default output height */
+ ASSIGN_INT_VALUE( VOUT_HEIGHT_VAR, "preferences_video_height_spinbutton" );
+
+ /* XXX Default screen depth */
+
+ /* XXX Default fullscreen depth */
+
+ /* XXX Default gamma */
+
+ /* Fullscreen on play */
+ ASSIGN_INT_TOGGLE( VOUT_FULLSCREEN_VAR,
+ "preferences_video_fullscreen_checkbutton" );
+
+ /* Grayscale display */
+ ASSIGN_INT_TOGGLE( VOUT_GRAYSCALE_VAR,
+ "preferences_video_grayscale_checkbutton" );
+
+ /* Default audio output */
+ ASSIGN_PSZ_ENTRY( AOUT_METHOD_VAR, "preferences_audio_output_entry" );
+
+ /* Default audio device */
+ ASSIGN_PSZ_ENTRY( AOUT_DSP_VAR, "preferences_audio_device_entry" );
+
+ /* XXX Default frequency */
+
+ /* XXX Default quality */
+
+ /* XXX Default number of channels */
+
+ /* Use spdif output ? */
+ ASSIGN_INT_TOGGLE( AOUT_SPDIF_VAR, "preferences_audio_spdif_checkbutton" );
+
+ /* Launch playlist on startup */
+ ASSIGN_INT_TOGGLE( PLAYLIST_STARTUP_VAR,
+ "preferences_playlist_launch_on_startup_checkbutton" );
+
+ /* Enqueue drag'n dropped item as default */
+ ASSIGN_INT_TOGGLE( PLAYLIST_ENQUEUE_VAR,
+ "preferences_playlist_enqueue_as_default_checkbutton" );
+
+ /* Loop on playlist end */
+ ASSIGN_INT_TOGGLE( PLAYLIST_LOOP_VAR,
+ "preferences_playlist_loop_checkbutton" );
+
+ /* Verbosity of warning messages */
+ ASSIGN_INT_VALUE( INTF_WARNING_VAR,
+ "preferences_misc_messages_spinbutton" );
+#undef ASSIGN_PSZ_ENTRY
+#undef ASSIGN_INT_VALUE
+#undef ASSIGN_INT_TOGGLE
+#endif
}
gtk_box_pack_start (GTK_BOX (vbox8), file_box, TRUE, TRUE, 0);
gtk_widget_set_usize (file_box, 500, 24);
- label_status = gtk_label_new (_("Playlist empty"));
+ label_status = gtk_label_new ("");
gtk_widget_ref (label_status);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "label_status", label_status,
(GtkDestroyNotify) gtk_widget_unref);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_preferences",
intf_popup_uiinfo[17].widget,
(GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_set_sensitive (intf_popup_uiinfo[17].widget, FALSE);
gtk_widget_ref (intf_popup_uiinfo[18].widget);
gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator2",
gtk_object_set_data (GTK_OBJECT (intf_fileopen), "intf_fileopen", intf_fileopen);
gtk_container_set_border_width (GTK_CONTAINER (intf_fileopen), 10);
gtk_window_set_modal (GTK_WINDOW (intf_fileopen), TRUE);
+ gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (intf_fileopen));
fileopen_ok = GTK_FILE_SELECTION (intf_fileopen)->ok_button;
gtk_object_set_data (GTK_OBJECT (intf_fileopen), "fileopen_ok", fileopen_ok);
GtkWidget *jump_vbox;
GtkWidget *jump_frame;
GtkWidget *jump_box;
+ GtkWidget *jump_label3;
GtkObject *jump_second_spinbutton_adj;
GtkWidget *jump_second_spinbutton;
GtkWidget *jump_label1;
gtk_object_set_data (GTK_OBJECT (intf_jump), "jump_vbox", jump_vbox);
gtk_widget_show (jump_vbox);
- jump_frame = gtk_frame_new (_("Jump to:"));
+ jump_frame = gtk_frame_new (_("Jump to: "));
gtk_widget_ref (jump_frame);
gtk_object_set_data_full (GTK_OBJECT (intf_jump), "jump_frame", jump_frame,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (jump_box);
gtk_container_add (GTK_CONTAINER (jump_frame), jump_box);
+ jump_label3 = gtk_label_new (_("s."));
+ gtk_widget_ref (jump_label3);
+ gtk_object_set_data_full (GTK_OBJECT (intf_jump), "jump_label3", jump_label3,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (jump_label3);
+ gtk_box_pack_end (GTK_BOX (jump_box), jump_label3, FALSE, FALSE, 0);
+
jump_second_spinbutton_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
jump_second_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (jump_second_spinbutton_adj), 1, 0);
gtk_widget_ref (jump_second_spinbutton);
gtk_widget_show (jump_second_spinbutton);
gtk_box_pack_end (GTK_BOX (jump_box), jump_second_spinbutton, FALSE, FALSE, 5);
- jump_label1 = gtk_label_new (_(":"));
+ jump_label1 = gtk_label_new (_("m:"));
gtk_widget_ref (jump_label1);
gtk_object_set_data_full (GTK_OBJECT (intf_jump), "jump_label1", jump_label1,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (jump_minute_spinbutton);
gtk_box_pack_end (GTK_BOX (jump_box), jump_minute_spinbutton, FALSE, FALSE, 5);
- jump_label2 = gtk_label_new (_(":"));
+ jump_label2 = gtk_label_new (_("h:"));
gtk_widget_ref (jump_label2);
gtk_object_set_data_full (GTK_OBJECT (intf_jump), "jump_label2", jump_label2,
(GtkDestroyNotify) gtk_widget_unref);
GtkWidget *preferences_network_server_entry;
GtkWidget *preferences_network_broadcast_combo;
GtkWidget *preferences_network_broadcast_entry;
- GtkWidget *preferences_network_broadcast_check_button;
+ GtkWidget *preferences_network_broadcast_checkbutton;
GSList *preferences_network_protocol_group_group = NULL;
GtkWidget *preferences_network_ts_radiobutton;
GtkWidget *preferences_network_rtp_radiobutton;
GtkWidget *preferences_network;
GtkWidget *preferences_network_interface_table;
GtkWidget *preferences_interface_label;
- GtkWidget *preferences_network_interface_combo;
- GtkWidget *preferences_network_interface_entry;
+ GtkWidget *preferences_interface_combo;
+ GtkWidget *preferences_interface_entry;
GtkWidget *preferences_interface;
GtkWidget *preferences_video_table;
GtkWidget *preferences_video_output_label;
GtkWidget *preferences_audio_channels_label;
GtkWidget *preferences_audio_channels_optionmenu;
GtkWidget *preferences_audio_channels_optionmenu_menu;
+ GtkWidget *preferences_audio_device_label;
+ GtkWidget *preferences_audio_device_combo;
+ GtkWidget *preferences_audio_device_entry;
GtkWidget *preferences_audio;
GtkWidget *preference_playlist_table;
GtkWidget *preferences_playlist_launch_on_startup_checkbutton;
GtkWidget *preferences_playlist_loop_checkbutton;
- GtkWidget *playlist_enqueue_as_default_checkbutton;
+ GtkWidget *preferences_playlist_enqueue_as_default_checkbutton;
GtkWidget *preferences_playlist;
GtkWidget *preferences_misc_table;
- GtkWidget *preferences_misc_associated_filesframe;
- GtkWidget *preferences_misc_associated_files_vbox;
+ GtkWidget *preferences_misc_message_frame;
+ GtkWidget *preferences_misc_message_table;
+ GtkWidget *preferences_misc_messages_label;
+ GtkObject *preferences_misc_messages_spinbutton_adj;
+ GtkWidget *preferences_misc_messages_spinbutton;
+ GtkWidget *preferences_misc_associated_files_frame;
+ GtkWidget *preferences_misc_associated_table;
GtkWidget *preferences_misc_mpeg_checkbutton;
GtkWidget *preferences_misc_mp2_checkbutton;
GtkWidget *preferences_misc_vob_checkbutton;
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_network_broadcast_entry);
- preferences_network_broadcast_check_button = gtk_check_button_new_with_label (_("Broadcast mode"));
- gtk_widget_ref (preferences_network_broadcast_check_button);
- gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_network_broadcast_check_button", preferences_network_broadcast_check_button,
+ preferences_network_broadcast_checkbutton = gtk_check_button_new_with_label (_("Broadcast mode"));
+ gtk_widget_ref (preferences_network_broadcast_checkbutton);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_network_broadcast_checkbutton", preferences_network_broadcast_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (preferences_network_broadcast_check_button);
- gtk_table_attach (GTK_TABLE (preferences_network_table), preferences_network_broadcast_check_button, 0, 1, 3, 4,
+ gtk_widget_show (preferences_network_broadcast_checkbutton);
+ gtk_table_attach (GTK_TABLE (preferences_network_table), preferences_network_broadcast_checkbutton, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
gtk_misc_set_alignment (GTK_MISC (preferences_interface_label), 0, 0.5);
- preferences_network_interface_combo = gnome_entry_new (NULL);
- gtk_widget_ref (preferences_network_interface_combo);
- gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_network_interface_combo", preferences_network_interface_combo,
+ preferences_interface_combo = gnome_entry_new (NULL);
+ gtk_widget_ref (preferences_interface_combo);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_interface_combo", preferences_interface_combo,
(GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (preferences_network_interface_combo);
- gtk_table_attach (GTK_TABLE (preferences_network_interface_table), preferences_network_interface_combo, 1, 2, 0, 1,
+ gtk_widget_show (preferences_interface_combo);
+ gtk_table_attach (GTK_TABLE (preferences_network_interface_table), preferences_interface_combo, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- preferences_network_interface_entry = gnome_entry_gtk_entry (GNOME_ENTRY (preferences_network_interface_combo));
- gtk_widget_ref (preferences_network_interface_entry);
- gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_network_interface_entry", preferences_network_interface_entry,
+ preferences_interface_entry = gnome_entry_gtk_entry (GNOME_ENTRY (preferences_interface_combo));
+ gtk_widget_ref (preferences_interface_entry);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_interface_entry", preferences_interface_entry,
(GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (preferences_network_interface_entry);
+ gtk_widget_show (preferences_interface_entry);
preferences_interface = gtk_label_new (_("Interface"));
gtk_widget_ref (preferences_interface);
gtk_widget_show (preferences_video);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (preferences_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (preferences_notebook), 4), preferences_video);
- preference_audio_table = gtk_table_new (5, 2, FALSE);
+ preference_audio_table = gtk_table_new (6, 2, FALSE);
gtk_widget_ref (preference_audio_table);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preference_audio_table", preference_audio_table,
(GtkDestroyNotify) gtk_widget_unref);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_spdif_checkbutton", preferences_audio_spdif_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_spdif_checkbutton);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_spdif_checkbutton, 0, 2, 4, 5,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_spdif_checkbutton, 0, 2, 5, 6,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_frequency_label", preferences_audio_frequency_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_frequency_label);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_frequency_label, 0, 1, 1, 2,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_frequency_label, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
gtk_misc_set_alignment (GTK_MISC (preferences_audio_frequency_label), 0, 0.5);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_frequency_optionmenu", preferences_audio_frequency_optionmenu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_frequency_optionmenu);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_frequency_optionmenu, 1, 2, 1, 2,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_frequency_optionmenu, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
preferences_audio_frequency_optionmenu_menu = gtk_menu_new ();
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_quality_label", preferences_audio_quality_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_quality_label);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_quality_label, 0, 1, 2, 3,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_quality_label, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
gtk_misc_set_alignment (GTK_MISC (preferences_audio_quality_label), 0, 0.5);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_quality_optionmenu", preferences_audio_quality_optionmenu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_quality_optionmenu);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_quality_optionmenu, 1, 2, 2, 3,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_quality_optionmenu, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
preferences_audio_quality_optionmenu_menu = gtk_menu_new ();
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_channels_label", preferences_audio_channels_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_channels_label);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_channels_label, 0, 1, 3, 4,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_channels_label, 0, 1, 4, 5,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
gtk_misc_set_alignment (GTK_MISC (preferences_audio_channels_label), 0, 0.5);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_channels_optionmenu", preferences_audio_channels_optionmenu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_audio_channels_optionmenu);
- gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_channels_optionmenu, 1, 2, 3, 4,
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_channels_optionmenu, 1, 2, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
preferences_audio_channels_optionmenu_menu = gtk_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (preferences_audio_channels_optionmenu), preferences_audio_channels_optionmenu_menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (preferences_audio_channels_optionmenu), 1);
+ preferences_audio_device_label = gtk_label_new (_("Default device:"));
+ gtk_widget_ref (preferences_audio_device_label);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_device_label", preferences_audio_device_label,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_audio_device_label);
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_device_label, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_EXPAND),
+ (GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (preferences_audio_device_label), 0, 0.5);
+
+ preferences_audio_device_combo = gnome_entry_new (NULL);
+ gtk_widget_ref (preferences_audio_device_combo);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_device_combo", preferences_audio_device_combo,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_audio_device_combo);
+ gtk_table_attach (GTK_TABLE (preference_audio_table), preferences_audio_device_combo, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND), 0, 0);
+
+ preferences_audio_device_entry = gnome_entry_gtk_entry (GNOME_ENTRY (preferences_audio_device_combo));
+ gtk_widget_ref (preferences_audio_device_entry);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio_device_entry", preferences_audio_device_entry,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_audio_device_entry);
+
preferences_audio = gtk_label_new (_("Audio"));
gtk_widget_ref (preferences_audio);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_audio", preferences_audio,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- playlist_enqueue_as_default_checkbutton = gtk_check_button_new_with_label (_("Enqueue as default"));
- gtk_widget_ref (playlist_enqueue_as_default_checkbutton);
- gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "playlist_enqueue_as_default_checkbutton", playlist_enqueue_as_default_checkbutton,
+ preferences_playlist_enqueue_as_default_checkbutton = gtk_check_button_new_with_label (_("Enqueue as default"));
+ gtk_widget_ref (preferences_playlist_enqueue_as_default_checkbutton);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_playlist_enqueue_as_default_checkbutton", preferences_playlist_enqueue_as_default_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (playlist_enqueue_as_default_checkbutton);
- gtk_table_attach (GTK_TABLE (preference_playlist_table), playlist_enqueue_as_default_checkbutton, 0, 1, 1, 2,
+ gtk_widget_show (preferences_playlist_enqueue_as_default_checkbutton);
+ gtk_table_attach (GTK_TABLE (preference_playlist_table), preferences_playlist_enqueue_as_default_checkbutton, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
gtk_widget_show (preferences_playlist);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (preferences_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (preferences_notebook), 6), preferences_playlist);
- preferences_misc_table = gtk_table_new (1, 1, FALSE);
+ preferences_misc_table = gtk_table_new (1, 2, FALSE);
gtk_widget_ref (preferences_misc_table);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_table", preferences_misc_table,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_misc_table);
gtk_container_add (GTK_CONTAINER (preferences_notebook), preferences_misc_table);
- preferences_misc_associated_filesframe = gtk_frame_new (_("Files associated with vlc"));
- gtk_widget_ref (preferences_misc_associated_filesframe);
- gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_associated_filesframe", preferences_misc_associated_filesframe,
+ preferences_misc_message_frame = gtk_frame_new (_("Messages"));
+ gtk_widget_ref (preferences_misc_message_frame);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_message_frame", preferences_misc_message_frame,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_misc_message_frame);
+ gtk_table_attach (GTK_TABLE (preferences_misc_table), preferences_misc_message_frame, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_EXPAND),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+ gtk_frame_set_label_align (GTK_FRAME (preferences_misc_message_frame), 0.05, 0.5);
+
+ preferences_misc_message_table = gtk_table_new (1, 2, FALSE);
+ gtk_widget_ref (preferences_misc_message_table);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_message_table", preferences_misc_message_table,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_misc_message_table);
+ gtk_container_add (GTK_CONTAINER (preferences_misc_message_frame), preferences_misc_message_table);
+
+ preferences_misc_messages_label = gtk_label_new (_("Warning level: "));
+ gtk_widget_ref (preferences_misc_messages_label);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_messages_label", preferences_misc_messages_label,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_misc_messages_label);
+ gtk_table_attach (GTK_TABLE (preferences_misc_message_table), preferences_misc_messages_label, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ preferences_misc_messages_spinbutton_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+ preferences_misc_messages_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (preferences_misc_messages_spinbutton_adj), 1, 0);
+ gtk_widget_ref (preferences_misc_messages_spinbutton);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_messages_spinbutton", preferences_misc_messages_spinbutton,
(GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (preferences_misc_associated_filesframe);
- gtk_table_attach (GTK_TABLE (preferences_misc_table), preferences_misc_associated_filesframe, 0, 1, 0, 1,
+ gtk_widget_show (preferences_misc_messages_spinbutton);
+ gtk_table_attach (GTK_TABLE (preferences_misc_message_table), preferences_misc_messages_spinbutton, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ preferences_misc_associated_files_frame = gtk_frame_new (_("Files associated with vlc"));
+ gtk_widget_ref (preferences_misc_associated_files_frame);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_associated_files_frame", preferences_misc_associated_files_frame,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (preferences_misc_associated_files_frame);
+ gtk_table_attach (GTK_TABLE (preferences_misc_table), preferences_misc_associated_files_frame, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_widget_set_sensitive (preferences_misc_associated_filesframe, FALSE);
- gtk_frame_set_label_align (GTK_FRAME (preferences_misc_associated_filesframe), 0.05, 0.5);
+ gtk_widget_set_sensitive (preferences_misc_associated_files_frame, FALSE);
+ gtk_frame_set_label_align (GTK_FRAME (preferences_misc_associated_files_frame), 0.05, 0.5);
- preferences_misc_associated_files_vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_ref (preferences_misc_associated_files_vbox);
- gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_associated_files_vbox", preferences_misc_associated_files_vbox,
+ preferences_misc_associated_table = gtk_table_new (4, 1, FALSE);
+ gtk_widget_ref (preferences_misc_associated_table);
+ gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_associated_table", preferences_misc_associated_table,
(GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (preferences_misc_associated_files_vbox);
- gtk_container_add (GTK_CONTAINER (preferences_misc_associated_filesframe), preferences_misc_associated_files_vbox);
+ gtk_widget_show (preferences_misc_associated_table);
+ gtk_container_add (GTK_CONTAINER (preferences_misc_associated_files_frame), preferences_misc_associated_table);
preferences_misc_mpeg_checkbutton = gtk_check_button_new_with_label (_("mpeg"));
gtk_widget_ref (preferences_misc_mpeg_checkbutton);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_mpeg_checkbutton", preferences_misc_mpeg_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_misc_mpeg_checkbutton);
- gtk_box_pack_start (GTK_BOX (preferences_misc_associated_files_vbox), preferences_misc_mpeg_checkbutton, FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (preferences_misc_associated_table), preferences_misc_mpeg_checkbutton, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
preferences_misc_mp2_checkbutton = gtk_check_button_new_with_label (_("mp2"));
gtk_widget_ref (preferences_misc_mp2_checkbutton);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_mp2_checkbutton", preferences_misc_mp2_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_misc_mp2_checkbutton);
- gtk_box_pack_start (GTK_BOX (preferences_misc_associated_files_vbox), preferences_misc_mp2_checkbutton, FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (preferences_misc_associated_table), preferences_misc_mp2_checkbutton, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
preferences_misc_vob_checkbutton = gtk_check_button_new_with_label (_("vob"));
gtk_widget_ref (preferences_misc_vob_checkbutton);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_vob_checkbutton", preferences_misc_vob_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_misc_vob_checkbutton);
- gtk_box_pack_start (GTK_BOX (preferences_misc_associated_files_vbox), preferences_misc_vob_checkbutton, FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (preferences_misc_associated_table), preferences_misc_vob_checkbutton, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
preferences_misc_ts_checkbutton = gtk_check_button_new_with_label (_("ts"));
gtk_widget_ref (preferences_misc_ts_checkbutton);
gtk_object_set_data_full (GTK_OBJECT (intf_preferences), "preferences_misc_ts_checkbutton", preferences_misc_ts_checkbutton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (preferences_misc_ts_checkbutton);
- gtk_box_pack_start (GTK_BOX (preferences_misc_associated_files_vbox), preferences_misc_ts_checkbutton, FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (preferences_misc_associated_table), preferences_misc_ts_checkbutton, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
preferences_misc = gtk_label_new (_("Misc"));
gtk_widget_ref (preferences_misc);
* 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>
*
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:// */
/* eat one '/' */
p_string++;
}
- intf_WarnMsg( 1, " Dropped %s", p_string );
+ intf_WarnMsg( 4, " Dropped %s", p_string );
}
else
{
/* 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. */
{
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 ) );
}
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 )
{
* 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>
* Stéphane Borel <stef@via.ecp.fr>
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
<widget>
<class>GtkLabel</class>
<name>label_status</name>
- <label>Playlist empty</label>
+ <label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_preferences</name>
+ <sensitive>False</sensitive>
<signal>
<name>activate</name>
<handler>on_popup_preferences_activate</handler>
<allow_shrink>False</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
- <show_file_op_buttons>True</show_file_op_buttons>
+ <show_file_op_buttons>False</show_file_op_buttons>
<widget>
<class>GtkButton</class>
<widget>
<class>GtkFrame</class>
<name>jump_frame</name>
- <label>Jump to:</label>
+ <label>Jump to: </label>
<label_xalign>0.05</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
+ <widget>
+ <class>GtkLabel</class>
+ <name>jump_label3</name>
+ <label>s.</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ <pack>GTK_PACK_END</pack>
+ </child>
+ </widget>
+
<widget>
<class>GtkSpinButton</class>
<name>jump_second_spinbutton</name>
<widget>
<class>GtkLabel</class>
<name>jump_label1</name>
- <label>:</label>
+ <label>m:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<widget>
<class>GtkLabel</class>
<name>jump_label2</name>
- <label>:</label>
+ <label>h:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<widget>
<class>GtkCheckButton</class>
- <name>preferences_network_broadcast_check_button</name>
+ <name>preferences_network_broadcast_checkbutton</name>
<can_focus>True</can_focus>
<label>Broadcast mode</label>
<active>False</active>
<widget>
<class>GnomeEntry</class>
- <name>preferences_network_interface_combo</name>
+ <name>preferences_interface_combo</name>
<max_saved>10</max_saved>
<child>
<left_attach>1</left_attach>
<widget>
<class>GtkEntry</class>
<child_name>GnomeEntry:entry</child_name>
- <name>preferences_network_interface_entry</name>
+ <name>preferences_interface_entry</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<widget>
<class>GtkTable</class>
<name>preference_audio_table</name>
- <rows>5</rows>
+ <rows>6</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<child>
<left_attach>0</left_attach>
<right_attach>2</right_attach>
- <top_attach>4</top_attach>
- <bottom_attach>5</bottom_attach>
+ <top_attach>5</top_attach>
+ <bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
- <top_attach>1</top_attach>
- <bottom_attach>2</bottom_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
- <top_attach>2</top_attach>
- <bottom_attach>3</bottom_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
- <top_attach>3</top_attach>
- <bottom_attach>4</bottom_attach>
+ <top_attach>4</top_attach>
+ <bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yfill>False</yfill>
</child>
</widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>preferences_audio_device_label</name>
+ <label>Default device:</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>True</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GnomeEntry</class>
+ <name>preferences_audio_device_combo</name>
+ <max_saved>10</max_saved>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>True</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+
+ <widget>
+ <class>GtkEntry</class>
+ <child_name>GnomeEntry:entry</child_name>
+ <name>preferences_audio_device_entry</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ </widget>
+ </widget>
</widget>
<widget>
<widget>
<class>GtkCheckButton</class>
- <name>playlist_enqueue_as default_checkbutton</name>
+ <name>preferences_playlist_enqueue_as_default_checkbutton</name>
<can_focus>True</can_focus>
<label>Enqueue as default</label>
<active>False</active>
<class>GtkTable</class>
<name>preferences_misc_table</name>
<rows>1</rows>
- <columns>1</columns>
+ <columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkFrame</class>
- <name>preferences_misc_associated_filesframe</name>
+ <name>preferences_misc_message_frame</name>
+ <label>Messages</label>
+ <label_xalign>0.05</label_xalign>
+ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>True</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>False</xfill>
+ <yfill>True</yfill>
+ </child>
+
+ <widget>
+ <class>GtkTable</class>
+ <name>preferences_misc_message_table</name>
+ <rows>1</rows>
+ <columns>2</columns>
+ <homogeneous>False</homogeneous>
+ <row_spacing>0</row_spacing>
+ <column_spacing>0</column_spacing>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>preferences_misc_messages_label</name>
+ <label>Warning level: </label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkSpinButton</class>
+ <name>preferences_misc_messages_spinbutton</name>
+ <can_focus>True</can_focus>
+ <climb_rate>1</climb_rate>
+ <digits>0</digits>
+ <numeric>False</numeric>
+ <update_policy>GTK_UPDATE_ALWAYS</update_policy>
+ <snap>False</snap>
+ <wrap>False</wrap>
+ <value>0</value>
+ <lower>0</lower>
+ <upper>100</upper>
+ <step>1</step>
+ <page>10</page>
+ <page_size>10</page_size>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+ </widget>
+ </widget>
+
+ <widget>
+ <class>GtkFrame</class>
+ <name>preferences_misc_associated_files_frame</name>
<sensitive>False</sensitive>
<label>Files associated with vlc</label>
<label_xalign>0.05</label_xalign>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
- <xfill>True</xfill>
+ <xfill>False</xfill>
<yfill>True</yfill>
</child>
<widget>
- <class>GtkVBox</class>
- <name>preferences_misc_associated_files_vbox</name>
+ <class>GtkTable</class>
+ <name>preferences_misc_associated_table</name>
+ <rows>4</rows>
+ <columns>1</columns>
<homogeneous>False</homogeneous>
- <spacing>0</spacing>
+ <row_spacing>0</row_spacing>
+ <column_spacing>0</column_spacing>
<widget>
<class>GtkCheckButton</class>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
</child>
</widget>
</widget>
* 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>
*
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:// */
/* eat one '/' */
string++;
}
- intf_WarnMsg(1,"Dropped %s",string);
+ intf_WarnMsg(4,"Dropped %s",string);
}
else
{
/* 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. */
{
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
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 )
{
* 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>
* Stéphane Borel <stef@via.ecp.fr>
{
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" );
}
* 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>
*
#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 );
* 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>
/* 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 )
* 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>
*
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:
* 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>
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;
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 !" );
}
* 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>
/* Other event */
else
{
- intf_WarnMsg( 1, "vout: unhandled event %d received", xevent.type );
+ intf_WarnMsg( 3, "vout: unhandled event %d received", xevent.type );
}
}
* 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>
/* 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 );
}
}
* 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>
if (parse_bsi (p_ac3dec))
{
- intf_WarnMsg (1,"Error during ac3parsing");
+ intf_WarnMsg (3,"Error during ac3parsing");
parse_auxdata (p_ac3dec);
return 1;
}
if (parse_audblk (p_ac3dec, i))
{
- intf_WarnMsg (1,"Error during ac3audioblock");
+ intf_WarnMsg (3,"Error during ac3audioblock");
parse_auxdata (p_ac3dec);
return 1;
}
if (exponent_unpack (p_ac3dec))
{
- intf_WarnMsg (1,"Error during ac3unpack");
+ intf_WarnMsg (3,"Error during ac3unpack");
parse_auxdata (p_ac3dec);
return 1;
}
* 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>
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;
}
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;
}
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;
}
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;
}
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;
}
* 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: Stéphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
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 */
* 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>
*
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 );
* 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>
* Stéphane Borel <stef@via.ecp.fr>
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 */
}
}
- intf_WarnMsg( 2, "aout info: exiting spdif loop" );
+ intf_WarnMsg( 3, "aout info: exiting spdif loop" );
return;
}
* 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>
*
{
/* 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
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) )
*****************************************************************************/
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;
* 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>
*
/* 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 );
* 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>
*
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,
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 );
}
}
{
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 );
* 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>
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;
{
/* 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 )
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 );
{
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 );
{
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 );
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;
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;
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;
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 );
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;
}
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;
}
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 );
}
}
* 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;
}
{
/* 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 )
* 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>
*
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 );
}
* 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>
*
{
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 );
{
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 );
* 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>
*
/* The playlist is empty */
p_playlist->p_item = NULL;
- intf_WarnMsg( 1, "intf: playlist initialized" );
+ intf_WarnMsg( 3, "intf: playlist initialized" );
}
/*****************************************************************************
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 );
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 */
free( p_playlist );
- intf_WarnMsg( 1, "intf: playlist destroyed" );
+ intf_WarnMsg( 3, "intf: playlist destroyed" );
}
/*****************************************************************************
* 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>
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 ];
return( -1 );
break;
case 'v': /* -v, --verbose */
- p_main->i_warning_level--;
+ p_main->i_warning_level++;
break;
/* Interface warning messages level */
* 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>
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 )) )
{
}
#endif /* HAVE_DYNAMIC_PLUGINS */
- intf_WarnMsg( 1, "module: module bank initialized" );
+ intf_WarnMsg( 3, "module: module bank initialized" );
return;
}
}
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 );
if( p_bestmodule != NULL )
{
- intf_WarnMsg( 3, "module: locking module `%s'",
+ intf_WarnMsg( 1, "module: locking module `%s'",
p_bestmodule->psz_name );
}
* 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 );
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 );
}
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() );
* 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>
*
*****************************************************************************/
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
}
/* 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 );
}
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] );
* 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>
*
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 );
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,
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 );
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 );
* 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>
* Stéphane Borel <stef@via.ecp.fr>
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 ? */
* 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>
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;
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;
}
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;
}
projects / vlc / commitdiff