Commit f8559f6f authored by Stéphane Borel's avatar Stéphane Borel

The gnome/gtk interface should no longer user p_input->stream before it
has been initialized.
parent ece3ae98
......@@ -6,7 +6,7 @@
* It depends on: libdvdread for ifo files and block reading.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: input_dvdread.c,v 1.18 2002/01/10 04:11:25 sam Exp $
* $Id: input_dvdread.c,v 1.19 2002/01/15 19:01:28 stef Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -285,10 +285,9 @@ static void DvdReadOpen( struct input_thread_s *p_input )
/* If we are here we can control the pace... */
p_input->stream.b_pace_control = 1;
p_input->stream.b_seekable = 1;
p_input->stream.p_selected_area->i_size = 0;
p_input->stream.p_selected_area->i_tell = 0;
vlc_mutex_unlock( &p_input->stream.stream_lock );
......
......@@ -2,7 +2,7 @@
* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: gnome.c,v 1.7 2002/01/09 02:01:14 sam Exp $
* $Id: gnome.c,v 1.8 2002/01/15 19:01:28 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -162,7 +162,7 @@ static int intf_Open( intf_thread_t *p_intf )
}
/* Initialize Gnome thread */
p_intf->p_sys->b_playing = 1;
p_intf->p_sys->b_playing = 0;
p_intf->p_sys->b_popup_changed = 0;
p_intf->p_sys->b_window_changed = 0;
p_intf->p_sys->b_playlist_changed = 0;
......@@ -340,7 +340,8 @@ static gint GnomeManage( gpointer p_data )
}
/* Manage the slider */
if( p_input_bank->pp_input[0]->stream.b_seekable )
if( p_input_bank->pp_input[0]->stream.b_seekable &&
p_intf->p_sys->b_playing )
{
float newvalue;
newvalue = p_intf->p_sys->p_adj->value;
......
......@@ -2,7 +2,7 @@
* gtk.c : Gtk+ plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: gtk.c,v 1.9 2002/01/09 02:01:14 sam Exp $
* $Id: gtk.c,v 1.10 2002/01/15 19:01:28 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -163,7 +163,7 @@ static int intf_Open( intf_thread_t *p_intf )
}
/* Initialize Gtk+ thread */
p_intf->p_sys->b_playing = 1;
p_intf->p_sys->b_playing = 0;
p_intf->p_sys->b_popup_changed = 0;
p_intf->p_sys->b_window_changed = 0;
p_intf->p_sys->b_playlist_changed = 0;
......@@ -343,7 +343,8 @@ static gint GtkManage( gpointer p_data )
}
/* Manage the slider */
if( p_input_bank->pp_input[0]->stream.b_seekable )
if( p_input_bank->pp_input[0]->stream.b_seekable &&
p_intf->p_sys->b_playing )
{
float newvalue = p_intf->p_sys->p_adj->value;
......
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.171 2002/01/15 17:55:12 stef Exp $
* $Id: input.c,v 1.172 2002/01/15 19:01:28 stef Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -171,6 +171,7 @@ input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status )
vlc_mutex_init( &p_input->stream.control.control_lock );
/* Initialize stream description */
p_input->stream.b_changed = 0;
p_input->stream.i_es_number = 0;
p_input->stream.i_selected_es_number = 0;
p_input->stream.i_pgrm_number = 0;
......
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