Skip to content

V
vlc
Commit 37e87108 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* renamed --spu-track to --sub-track 

* renamed --spumargin to --sub-margin
* renamed --spu-language to --sub-language
* added note to NEWS about changed names of options
parent a3a82045
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 25 deletions
NEWS
View file @ 37e87108
......@@ -14,19 +14,23 @@ Core support:
* XML parsers
* Core image manipulation support
* Client-side SSL/TLS support
* Renamed --spu-channel to --sub-track
* Renamed --spumargin to --sub-margin
* Renamed --audio-channel to --audio-track
* Track selection based on preferred language
Input:
* Support for SOCKS proxy
* Support for Shoutcast Meta-data
* Support for (HE-)AAC raw-audio streams
* Support for images on a HTTP server that get refreshed on the server
* Better support for Kasenna streams
* Improved CDDAX module (uses several playlist items)
* Fixes to Linux DVB support
Decoders / Encoders:
* AMR decoding via ffmpeg
* Dirac decoder and encoder
* PNG decoder
* PNG decoder/encoder
Services discovery
* New type of modules, that add items to the playlist
......@@ -35,8 +39,8 @@ Services discovery
* DAAP (iTunes shares) support
Video output:
* Snapshot support
* Image file video output
* Video snapshot support
* Image file video output (png or jpg)
* Motion detection filter (can trigger playlist actions)
Stream output:
......@@ -74,11 +78,17 @@ Mozilla Plugin:
* Javascript fixes
IE Plugin:
Brand new Internet Explorer ActiveX plugin
* Brand new Internet Explorer ActiveX plugin
Translations:
* Danish
* Greek
* Hindi
* Pashto
* Burmese
* Tetum
* Tagalog
* Bengali
Changes between 0.8.0 and 0.8.1:
-----------------------------------------------------
......@@ -104,6 +114,7 @@ Video Output:
Demuxers:
* Fixed crash with ODML avi files
* Fixed autodetection of VCD/SVCD bin files
* Supports Kasenna VoD (MPEG2 only) and simulcast streaming
Stream Output:
* Encoders:
......
include/vlc_es_out.h
View file @ 37e87108
......@@ -33,7 +33,7 @@ enum es_out_mode_e
{
ES_OUT_MODE_NONE, /* don't select anything */
ES_OUT_MODE_ALL, /* eg for stream output */
ES_OUT_MODE_AUTO, /* best audio/video or for input follow audio-track, spu-track */
ES_OUT_MODE_AUTO, /* best audio/video or for input follow audio-track, sub-track */
ES_OUT_MODE_PARTIAL /* select programs given after --programs */
};
......
include/vlc_input.h
View file @ 37e87108
......@@ -432,7 +432,7 @@ enum input_query_e
INPUT_GET_STATE, /* arg1= int * res= */
INPUT_SET_STATE, /* arg1= int res=can fail */
/* input variable "audio-delay" and "spu-delay" */
/* input variable "audio-delay" and "sub-delay" */
INPUT_GET_AUDIO_DELAY, /* arg1 = int* res=can fail */
INPUT_SET_AUDIO_DELAY, /* arg1 = int res=can fail */
INPUT_GET_SPU_DELAY, /* arg1 = int* res=can fail */
......
modules/access/dvdnav.c
View file @ 37e87108
......@@ -254,20 +254,20 @@ static int Open( vlc_object_t *p_this )
/* Set audio language */
psz_code = DemuxGetLanguageCode( p_demux, "audio-language" );
if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) !=
if( dvdnav_audio_language_select( p_sys->dvdnav, psz_code ) !=
DVDNAV_STATUS_OK )
{
msg_Warn( p_demux, "can't set audio language to '%s' (%s)",
psz_code, dvdnav_err_to_string( p_sys->dvdnav ) );
/* We try to fall back to 'en' */
if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT );
dvdnav_audio_language_select( p_sys->dvdnav, LANGUAGE_DEFAULT );
}
free( psz_code );
/* Set spu language */
psz_code = DemuxGetLanguageCode( p_demux, "spu-language" );
if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) !=
psz_code = DemuxGetLanguageCode( p_demux, "sub-language" );
if( dvdnav_spu_language_select( p_sys->dvdnav, psz_code ) !=
DVDNAV_STATUS_OK )
{
msg_Warn( p_demux, "can't set spu language to '%s' (%s)",
......
modules/codec/svcdsub.c
View file @ 37e87108
......@@ -249,7 +249,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
if( !p_input ) return NULL;
if( var_Get( p_input, "spu-track", &val ) )
if( var_Get( p_input, "sub-track", &val ) )
{
vlc_object_release( p_input );
return NULL;
......
modules/gui/wxwindows/open.cpp
View file @ 37e87108
......@@ -674,7 +674,7 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
sizer->Add( disc_sub_label, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
sizer->Add( disc_sub, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
disc_sub->SetRange( -1, 255 );
i_disc_sub = config_GetInt( p_intf, "spu-track" );
i_disc_sub = config_GetInt( p_intf, "sub-track" );
disc_sub->SetValue( i_disc_sub );
sizer_row->Add( sizer, 0, wxEXPAND | wxALL, 5 );
......@@ -831,7 +831,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
}
if( i_disc_sub >= 0 )
mrltemp += wxString::Format( wxT(" :spu-track=%d"),
mrltemp += wxString::Format( wxT(" :sub-track=%d"),
i_disc_sub );
break;
......@@ -849,7 +849,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
#endif
if( i_disc_sub >= 0 )
mrltemp += wxString::Format( wxT(" :spu-track=%d"),
mrltemp += wxString::Format( wxT(" :sub-track=%d"),
i_disc_sub );
caching_name = wxT("vcd-caching");
......
src/input/es_out.c
View file @ 37e87108
......@@ -162,7 +162,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
var_Get( p_input, "audio-track", &val );
p_sys->i_audio_last = val.i_int;
var_Get( p_input, "spu-track", &val );
var_Get( p_input, "sub-track", &val );
p_sys->i_sub_last = val.i_int;
var_Get( p_input, "audio-language", &val );
......@@ -174,7 +174,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
i, p_sys->ppsz_audio_language[i] );
}
var_Get( p_input, "spu-language", &val );
var_Get( p_input, "sub-language", &val );
p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
if( p_sys->ppsz_sub_language )
{
......
src/input/var.c
View file @ 37e87108
......@@ -398,10 +398,10 @@ void input_ConfigVarInit ( input_thread_t *p_input )
var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Create( p_input, "spu-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Create( p_input, "sub-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Create( p_input, "audio-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
var_Create( p_input, "spu-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
var_Create( p_input, "sub-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT );
var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL |
......
src/libvlc.h
View file @ 37e87108
......@@ -378,8 +378,8 @@ static char *ppsz_clock_descriptions[] =
"\"subpictures filters\" modules section. You can also set many " \
"miscellaneous subpictures options." )
#define SPUMARGIN_TEXT N_("Force SPU position")
#define SPUMARGIN_LONGTEXT N_( \
#define SUB_MARGIN_TEXT N_("Force subtitle position")
#define SUB_MARGIN_LONGTEXT N_( \
"You can use this option to place the subtitles under the movie, " \
"instead of over the movie. Try several positions.")
......@@ -969,8 +969,8 @@ vlc_module_begin();
SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE );
add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
SUB_FILE_LONGTEXT, VLC_TRUE );
add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT,
SPUMARGIN_LONGTEXT, VLC_TRUE );
add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT,
SUB_MARGIN_LONGTEXT, VLC_TRUE );
set_section( N_( "Overlays" ) , NULL );
add_module( "sub-filter", "sub filter", NULL, NULL,
......@@ -994,11 +994,11 @@ vlc_module_begin();
INPUT_PROGRAMS_TEXT, INPUT_PROGRAMS_LONGTEXT, VLC_FALSE );
add_integer( "audio-track", -1, NULL,
INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE );
add_integer( "spu-track", -1, NULL,
add_integer( "sub-track", -1, NULL,
INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE );
add_string( "audio-language", "", NULL,
INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, VLC_FALSE );
add_string( "spu-language", "", NULL,
add_string( "sub-language", "", NULL,
INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, 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