Commit 1ecb5149 authored by Laurent Aimar's avatar Laurent Aimar

* stream: fixed cast of lvalue.

 * input: fixed "position" value as soon as possible after a see, this
way the intf doesn't show strange seek bar behavour.
parent 26e9ba8a
...@@ -497,6 +497,11 @@ static int RunThread( input_thread_t *p_input ) ...@@ -497,6 +497,11 @@ static int RunThread( input_thread_t *p_input )
subtitle_Seek( p_input->p_sys->sub[i], i_time ); subtitle_Seek( p_input->p_sys->sub[i], i_time );
} }
} }
if( !demux_Control( p_input, DEMUX_GET_POSITION, &f ) )
{
val.f_float = (float)f;
var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
}
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
} }
p_input->stream.p_selected_area->i_seek = NO_SEEK; p_input->stream.p_selected_area->i_seek = NO_SEEK;
......
...@@ -100,7 +100,8 @@ stream_t *input_StreamNew( input_thread_t *p_input ) ...@@ -100,7 +100,8 @@ stream_t *input_StreamNew( input_thread_t *p_input )
s->pf_peek = IStreamPeek; s->pf_peek = IStreamPeek;
s->pf_control= IStreamControl; s->pf_control= IStreamControl;
p_sys = (input_stream_sys_t*)s->p_sys = malloc( sizeof( input_stream_sys_t ) ); s->p_sys = malloc( sizeof( input_stream_sys_t ) );
p_sys = (input_stream_sys_t*)s->p_sys;
p_sys->p_input = p_input; p_sys->p_input = p_input;
} }
return s; return s;
...@@ -358,7 +359,8 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, es_out_t *out ...@@ -358,7 +359,8 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, es_out_t *out
s->pf_peek = DStreamPeek; s->pf_peek = DStreamPeek;
s->pf_control= DStreamControl; s->pf_control= DStreamControl;
p_sys = (d_stream_sys_t*)s->p_sys = malloc( sizeof( d_stream_sys_t) ); s->p_sys = malloc( sizeof( d_stream_sys_t) );
p_sys = (d_stream_sys_t*)s->p_sys;
vlc_mutex_init( s, &p_sys->lock ); vlc_mutex_init( s, &p_sys->lock );
p_sys->i_buffer = 0; p_sys->i_buffer = 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