Changeset 02c94f5640a01d2039e025f596208b391f35a4e4

Show
Ignore:
Timestamp:
15/02/05 18:33:58 (4 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1108488838 +0000
git-parent:

[c959f01d691322d09acfe4345a547f081d85f74e]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1108488838 +0000
Message:

* renamed audio-channel to audio-track so ppl don't confuse it with audio-channels
* renamed spu-channel to spu-track
* "Tracks settings" should be "Track settings"

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_access.h

    re3a434c r02c94f5  
    112112static inline int access2_vaControl( access_t *p_access, int i_query, va_list args ) 
    113113{ 
     114    if( !p_access ) return VLC_EGENERIC; 
    114115    return p_access->pf_control( p_access, i_query, args ); 
    115116} 

  • include/vlc_es_out.h

    rbf12bbf r02c94f5  
    3434    ES_OUT_MODE_NONE,   /* don't select anything */ 
    3535    ES_OUT_MODE_ALL,    /* eg for stream output */ 
    36     ES_OUT_MODE_AUTO,   /* best audio/video or for input follow audio-channel, spu-channel */ 
     36    ES_OUT_MODE_AUTO,   /* best audio/video or for input follow audio-track, spu-track */ 
    3737    ES_OUT_MODE_PARTIAL /* select programs given after --programs */ 
    3838}; 

  • modules/codec/svcdsub.c

    r6ad10b6 r02c94f5  
    250250        if( !p_input ) return NULL; 
    251251 
    252         if( var_Get( p_input, "spu-channel", &val ) ) 
     252        if( var_Get( p_input, "spu-track", &val ) ) 
    253253        { 
    254254            vlc_object_release( p_input ); 

  • modules/gui/wxwindows/open.cpp

    r2cd5aed r02c94f5  
    675675    sizer->Add( disc_sub, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL ); 
    676676    disc_sub->SetRange( -1, 255 ); 
    677     i_disc_sub = config_GetInt( p_intf, "spu-channel" ); 
     677    i_disc_sub = config_GetInt( p_intf, "spu-track" ); 
    678678    disc_sub->SetValue( i_disc_sub ); 
    679679 
    …… 
    832832 
    833833            if( i_disc_sub >= 0 ) 
    834                 mrltemp += wxString::Format( wxT("  :spu-channel=%d"), 
     834                mrltemp += wxString::Format( wxT("  :spu-track=%d"), 
    835835                                             i_disc_sub ); 
    836836            break; 
    …… 
    850850 
    851851            if( i_disc_sub >= 0 ) 
    852                 mrltemp += wxString::Format( wxT("  :spu-channel=%d"), 
     852                mrltemp += wxString::Format( wxT("  :spu-track=%d"), 
    853853                                             i_disc_sub ); 
    854854 

  • src/input/es_out.c

    r236ca7a r02c94f5  
    160160 
    161161    /* */ 
    162     var_Get( p_input, "audio-channel", &val ); 
     162    var_Get( p_input, "audio-track", &val ); 
    163163    p_sys->i_audio_last = val.i_int; 
    164164 
    165     var_Get( p_input, "spu-channel", &val ); 
     165    var_Get( p_input, "spu-track", &val ); 
    166166    p_sys->i_sub_last = val.i_int; 
    167167 

  • src/input/var.c

    re512e5b r02c94f5  
    398398    var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); 
    399399 
    400     var_Create( p_input, "audio-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); 
    401     var_Create( p_input, "spu-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); 
     400    var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); 
     401    var_Create( p_input, "spu-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); 
    402402 
    403403    var_Create( p_input, "audio-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); 

  • src/libvlc.h

    r17ce2b1 r02c94f5  
    330330    "(like DVB streams for example )" ) 
    331331 
    332 #define INPUT_CHAN_TEXT N_("Choose audio channel") 
    333 #define INPUT_CHAN_LONGTEXT N_( \ 
    334     "Give the stream number of the audio channel you want to use" \ 
     332#define INPUT_AUDIOTRACK_TEXT N_("Choose audio track") 
     333#define INPUT_AUDIOTRACK_LONGTEXT N_( \ 
     334    "Give the stream number of the audio track you want to use" \ 
    335335    "(from 0 to n).") 
    336336 
    337 #define INPUT_SUB_TEXT N_("Choose subtitles track") 
    338 #define INPUT_CHAN_LANG_TEXT N_("Choose audio language") 
    339 #define INPUT_CHAN_LANG_LONGTEXT N_( \ 
    340     "Give the language of the audio channel you want to use " \ 
     337#define INPUT_SUBTRACK_TEXT N_("Choose subtitles track") 
     338#define INPUT_SUBTRACK_LONGTEXT N_( \ 
     339    "Give the stream number of the subtitle track you want to use " \ 
     340    "(from 0 to n).") 
     341 
     342#define INPUT_AUDIOTRACK_LANG_TEXT N_("Choose audio language") 
     343#define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \ 
     344    "Give the language of the audio track you want to use " \ 
    341345    "(comma separted, two or tree letter country code).") 
    342 #define INPUT_SUB_LANG_TEXT N_("Choose subtitle track") 
    343 #define INPUT_SUB_LANG_LONGTEXT N_( \ 
    344     "Give the language of the subtitle channel you want to use " \ 
     346 
     347#define INPUT_SUBTRACK_LANG_TEXT N_("Choose subtitle track") 
     348#define INPUT_SUBTRACK_LANG_LONGTEXT N_( \ 
     349    "Give the language of the subtitle track you want to use " \ 
    345350    "(comma separted, two or tree letter country code).") 
    346  
    347  
    348 #define INPUT_SUB_LONGTEXT N_( \ 
    349     "Give the stream number of the subtitle channel you want to use " \ 
    350     "(from 0 to n).") 
    351351 
    352352#define INPUT_REPEAT_TEXT N_("Input repetitions") 
    …… 
    989989    set_subcategory( SUBCAT_INPUT_ADVANCED ); 
    990990 
    991     set_section( N_( "Tracks settings" ), NULL ); 
     991    set_section( N_( "Track settings" ), NULL ); 
    992992    add_integer( "program", 0, NULL, 
    993993                 INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); 
    994994    add_string( "programs", "", NULL, 
    995995                INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE ); 
    996     add_integer( "audio-channel", -1, NULL, 
    997                  INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_FALSE ); 
    998     add_integer( "spu-channel", -1, NULL, 
    999                  INPUT_SUB_TEXT, INPUT_SUB_LONGTEXT, VLC_FALSE ); 
     996    add_integer( "audio-track", -1, NULL, 
     997                 INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE ); 
     998    add_integer( "spu-track", -1, NULL, 
     999                 INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE ); 
    10001000    add_string( "audio-language", "", NULL, 
    1001                  INPUT_CHAN_LANG_TEXT, INPUT_CHAN_LANG_LONGTEXT, VLC_FALSE ); 
     1001                 INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, VLC_FALSE ); 
    10021002    add_string( "spu-language", "", NULL, 
    1003                  INPUT_SUB_LANG_TEXT, INPUT_SUB_LANG_LONGTEXT, VLC_FALSE ); 
     1003                 INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, VLC_FALSE ); 
    10041004 
    10051005