Changeset e3172f9ed0db72cfba79a16d115a8866d6deb35e

Show
Ignore:
Timestamp:
08/06/05 22:44:57 (3 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1118263497 +0000
git-parent:

[4c49f4bab48eb46016818c203ccabd440a938e03]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1118263497 +0000
Message:

Forward port of #11366

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/dvdnav.c

    ra1dcb36 re3172f9  
    217217    p_sys->i_mux_rate = 0; 
    218218    p_sys->i_pgc_length = 0; 
    219     p_sys->b_spu_change = 0; 
     219    p_sys->b_spu_change = VLC_FALSE; 
    220220 
    221221    if( 1 ) 
    …… 
    635635 
    636636        ESSubtitleUpdate( p_demux ); 
    637         p_sys->b_spu_change = 1; 
     637        p_sys->b_spu_change = VLC_TRUE; 
    638638 
    639639        /* HACK to get the SPU tracks registered in the right order */ 
    …… 
    744744         */ 
    745745        DemuxBlock( p_demux, packet, i_len ); 
    746         if( p_sys->b_spu_change ) ButtonUpdate( p_demux, 0 ); 
    747         p_sys->b_spu_change = 0; 
     746        if( p_sys->b_spu_change )  
     747    { 
     748        ButtonUpdate( p_demux, VLC_FALSE ); 
     749            p_sys->b_spu_change = VLC_FALSE; 
     750    } 
    748751        break; 
    749752    } 
    …… 
    763766        msg_Dbg( p_demux, "     - display=%d", event->display ); 
    764767        msg_Dbg( p_demux, "     - buttonN=%d", event->buttonN ); 
    765         ButtonUpdate( p_demux, 0 ); 
     768        ButtonUpdate( p_demux, VLC_FALSE ); 
    766769        break; 
    767770    } 
    …… 
    964967    int32_t i_title, i_part; 
    965968 
    966     ButtonUpdate( p_demux, 0 ); 
     969    ButtonUpdate( p_demux, VLC_FALSE ); 
    967970 
    968971    dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part ); 
    …… 
    11781181    tk->b_seen = VLC_TRUE; 
    11791182 
    1180     if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, 0 ); 
     1183    if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, VLC_FALSE ); 
    11811184} 
    11821185