Changeset 9160790e0c08ee50e6a795accdd2d9d2df4bfad3

Show
Ignore:
Timestamp:
06/01/05 23:58:13 (3 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1117663093 +0000
git-parent:

[c0156dd0c5d9139c1ee3b1378b471b0bae0518ce]

git-author:
Clément Stenac <zorglub@videolan.org> 1117663093 +0000
Message:

Merge mediacontrol to trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r62ac96d r9160790  
    6161    include/vlc/input.h \ 
    6262    include/vlc/intf.h \ 
     63    include/vlc/control.h \ 
    6364    $(NULL) 
    6465 
    …… 
    413414    src/misc/xml.c \ 
    414415    src/extras/libc.c \ 
     416    src/control/core.c \ 
     417    src/control/util.c \ 
     418    src/control/audio_video.c \ 
    415419    $(NULL) 
    416420 

  • src/libvlc.h

    r4ed95df r9160790  
    323323#define INPUT_PROGRAM_TEXT N_("Choose program (SID)") 
    324324#define INPUT_PROGRAM_LONGTEXT N_( \ 
    325     "Choose the program to select by giving its Service ID\n." \ 
     325    "Choose the program to select by giving its Service ID.\n" \ 
    326326    "Only use this option if you want to read a multi-program stream " \ 
    327     "(like DVB streams for example )" ) 
     327    "(ike DVB streams for example)" ) 
    328328 
    329329#define INPUT_PROGRAMS_TEXT N_("Choose programs") 
    …… 
    928928    add_module( "aout", "audio output", NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT, 
    929929                VLC_TRUE ); 
    930         change_short('A'); 
    931930    set_subcategory( SUBCAT_AUDIO_AFILTER ); 
    932931    add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, 0, 
    …… 
    12011200    add_module( "audio-channel-mixer", "audio mixer", NULL, NULL, 
    12021201                AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_TRUE ); 
     1202        change_short('A'); 
    12031203 
    12041204    set_section( N_("Plugins" ), NULL ); 

  • vlc-config.in.in

    r4275a65 r9160790  
    8383if test "${top_builddir}" != ""; then 
    8484  top_builddir="${top_builddir}/" 
     85elif test "${TOP_BUILDDIR}" != ""; then 
     86  top_builddir="${TOP_BUILDDIR}/" 
    8587fi 
    8688includes="${includes} -I${top_builddir}include"