Commit 5d51b9be authored by Stéphane Borel's avatar Stéphane Borel

-Fixed the title-change-with-no-input-restart in dvd.

-I haven't forgotten the chagelog this time :)
parent 2cc08ef1
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
HEAD HEAD
* DVD title change no longer restart the input.
* BeOS crash fix by Wade Majors <guru@startrek.com>. * BeOS crash fix by Wade Majors <guru@startrek.com>.
* Slight modification in ClockManageRef: after a synchro reinit, we still * Slight modification in ClockManageRef: after a synchro reinit, we still
do the mwait and re-init last-cr. do the mwait and re-init last-cr.
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.53 2001/04/29 14:52:42 stef Exp $ * $Id: input_dvd.c,v 1.54 2001/04/29 17:57:50 stef Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -581,7 +581,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -581,7 +581,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
/* uodate title environnement variable so that we don't /* uodate title environnement variable so that we don't
* loop on the same title forever */ * loop on the same title forever */
// main_PutIntVariable( INPUT_TITLE_VAR, p_dvd->i_title + 1 ); main_PutIntVariable( INPUT_TITLE_VAR, p_dvd->i_title + 1 );
/* ifo vts */ /* ifo vts */
if( IfoTitleSet( p_dvd->p_ifo ) < 0 ) if( IfoTitleSet( p_dvd->p_ifo ) < 0 )
...@@ -947,6 +947,9 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) ...@@ -947,6 +947,9 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
intf_WarnMsg( 2, "dvd info: angle %d selected", p_area->i_angle ); intf_WarnMsg( 2, "dvd info: angle %d selected", p_area->i_angle );
} }
/* warn interface that something has changed */
p_input->stream.b_changed = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
return 0; return 0;
...@@ -1139,7 +1142,7 @@ static int DVDRead( input_thread_t * p_input, ...@@ -1139,7 +1142,7 @@ static int DVDRead( input_thread_t * p_input,
p_input->stream.p_selected_area->i_tell += i_read_bytes; p_input->stream.p_selected_area->i_tell += i_read_bytes;
b_eot = !( p_input->stream.p_selected_area->i_tell < p_dvd->i_size ); b_eot = !( p_input->stream.p_selected_area->i_tell < p_dvd->i_size );
b_eof = b_eot && ( ( p_dvd->i_title + 1 ) < p_input->stream.i_area_nb ); b_eof = b_eot && ( ( p_dvd->i_title + 1 ) >= p_input->stream.i_area_nb );
p_area = p_input->stream.pp_areas[p_dvd->i_title + 1]; p_area = p_input->stream.pp_areas[p_dvd->i_title + 1];
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
......
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