Changeset 17eeea99c4940cbbd43f2c7e25da23f5e6e133c2

Show
Ignore:
Timestamp:
06/04/08 18:18:24 (3 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1212596304 +0300
git-parent:

[a8712a3720567c0b03612d0d93d354bd90f8b138]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1212596304 +0300
Message:

Simplify

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/input/es_out.c

    rd666030 r17eeea9  
    196196    out->pf_control = EsOutControl; 
    197197    out->p_sys      = p_sys; 
    198     out->b_sout     = (p_input->p->p_sout != NULL ? true : false); 
     198    out->b_sout     = p_input->p->p_sout != NULL; 
    199199 
    200200    p_sys->p_input = p_input; 
    …… 
    10581058        if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES ) 
    10591059        { 
    1060             if( !var_GetBool( p_input, "video" ) || 
    1061                 ( p_input->p->p_sout && !var_GetBool( p_input, "sout-video" ) ) ) 
     1060            if( !var_GetBool( p_input, out->b_sout ? "sout-video" : "video" ) ) 
    10621061            { 
    10631062                msg_Dbg( p_input, "video is disabled, not selecting ES 0x%x", 
    …… 
    10691068        { 
    10701069            var_Get( p_input, "audio", &val ); 
    1071             if( !var_GetBool( p_input, "audio" ) || 
    1072                 ( p_input->p->p_sout && !var_GetBool( p_input, "sout-audio" ) ) ) 
     1070            if( !var_GetBool( p_input, out->b_sout ? "sout-audio" : "audio" ) ) 
    10731071            { 
    10741072                msg_Dbg( p_input, "audio is disabled, not selecting ES 0x%x", 
    …… 
    10801078        { 
    10811079            var_Get( p_input, "spu", &val ); 
    1082             if( !var_GetBool( p_input, "spu" ) || 
    1083                 ( p_input->p->p_sout && !var_GetBool( p_input, "sout-spu" ) ) ) 
     1080            if( !var_GetBool( p_input, out->b_sout ? "sout-spu" : "spu" ) ) 
    10841081            { 
    10851082                msg_Dbg( p_input, "spu is disabled, not selecting ES 0x%x",