Commit e3172f9e authored by Jean-Paul Saman's avatar Jean-Paul Saman

Forward port of #11366

parent 4c49f4ba
...@@ -216,7 +216,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -216,7 +216,7 @@ static int Open( vlc_object_t *p_this )
p_sys->i_aspect = -1; p_sys->i_aspect = -1;
p_sys->i_mux_rate = 0; p_sys->i_mux_rate = 0;
p_sys->i_pgc_length = 0; p_sys->i_pgc_length = 0;
p_sys->b_spu_change = 0; p_sys->b_spu_change = VLC_FALSE;
if( 1 ) if( 1 )
{ {
...@@ -634,7 +634,7 @@ static int Demux( demux_t *p_demux ) ...@@ -634,7 +634,7 @@ static int Demux( demux_t *p_demux )
event->physical_pan_scan ); event->physical_pan_scan );
ESSubtitleUpdate( p_demux ); ESSubtitleUpdate( p_demux );
p_sys->b_spu_change = 1; p_sys->b_spu_change = VLC_TRUE;
/* HACK to get the SPU tracks registered in the right order */ /* HACK to get the SPU tracks registered in the right order */
for( i = 0; i < 0x1f; i++ ) for( i = 0; i < 0x1f; i++ )
...@@ -743,8 +743,11 @@ static int Demux( demux_t *p_demux ) ...@@ -743,8 +743,11 @@ static int Demux( demux_t *p_demux )
* - ... * - ...
*/ */
DemuxBlock( p_demux, packet, i_len ); DemuxBlock( p_demux, packet, i_len );
if( p_sys->b_spu_change ) ButtonUpdate( p_demux, 0 ); if( p_sys->b_spu_change )
p_sys->b_spu_change = 0; {
ButtonUpdate( p_demux, VLC_FALSE );
p_sys->b_spu_change = VLC_FALSE;
}
break; break;
} }
...@@ -762,7 +765,7 @@ static int Demux( demux_t *p_demux ) ...@@ -762,7 +765,7 @@ static int Demux( demux_t *p_demux )
msg_Dbg( p_demux, "DVDNAV_HIGHLIGHT" ); msg_Dbg( p_demux, "DVDNAV_HIGHLIGHT" );
msg_Dbg( p_demux, " - display=%d", event->display ); msg_Dbg( p_demux, " - display=%d", event->display );
msg_Dbg( p_demux, " - buttonN=%d", event->buttonN ); msg_Dbg( p_demux, " - buttonN=%d", event->buttonN );
ButtonUpdate( p_demux, 0 ); ButtonUpdate( p_demux, VLC_FALSE );
break; break;
} }
...@@ -963,7 +966,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) ...@@ -963,7 +966,7 @@ static void ESSubtitleUpdate( demux_t *p_demux )
int i_spu = dvdnav_get_active_spu_stream( p_sys->dvdnav ); int i_spu = dvdnav_get_active_spu_stream( p_sys->dvdnav );
int32_t i_title, i_part; int32_t i_title, i_part;
ButtonUpdate( p_demux, 0 ); ButtonUpdate( p_demux, VLC_FALSE );
dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part ); dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part );
if( i_title > 0 ) return; if( i_title > 0 ) return;
...@@ -1177,7 +1180,7 @@ static void ESNew( demux_t *p_demux, int i_id ) ...@@ -1177,7 +1180,7 @@ static void ESNew( demux_t *p_demux, int i_id )
} }
tk->b_seen = VLC_TRUE; tk->b_seen = VLC_TRUE;
if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, 0 ); if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, VLC_FALSE );
} }
/***************************************************************************** /*****************************************************************************
......
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