From 37e87108a37856c3cdbfba1abd7fa69ea6e5894a Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 15 Feb 2005 20:29:29 +0000 Subject: [PATCH] * 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 --- NEWS | 21 ++++++++++++++++----- include/vlc_es_out.h | 2 +- include/vlc_input.h | 2 +- modules/access/dvdnav.c | 8 ++++---- modules/codec/svcdsub.c | 2 +- modules/gui/wxwindows/open.cpp | 6 +++--- src/input/es_out.c | 4 ++-- src/input/var.c | 4 ++-- src/libvlc.h | 12 ++++++------ 9 files changed, 36 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index 8e9276aac2..eacdccc3c1 100644 --- a/NEWS +++ b/NEWS @@ -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: diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h index 8d6e16c9cd..13dc518cc5 100644 --- a/include/vlc_es_out.h +++ b/include/vlc_es_out.h @@ -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 */ }; diff --git a/include/vlc_input.h b/include/vlc_input.h index 1ceab6efb5..29c5287c89 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -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 */ diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index d5a7569fc1..5d6b5300a6 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -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)", diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c index ee849944b3..a4f8efc32f 100644 --- a/modules/codec/svcdsub.c +++ b/modules/codec/svcdsub.c @@ -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; diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp index 5a96e5fd9b..375d1f7f4c 100644 --- a/modules/gui/wxwindows/open.cpp +++ b/modules/gui/wxwindows/open.cpp @@ -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"); diff --git a/src/input/es_out.c b/src/input/es_out.c index 7a1c443bb4..e0ca0886b8 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -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 ) { diff --git a/src/input/var.c b/src/input/var.c index aa483795b6..48c9d5036d 100644 --- a/src/input/var.c +++ b/src/input/var.c @@ -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 | diff --git a/src/libvlc.h b/src/libvlc.h index d18accd99a..4d9cad154d 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -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 ); -- 2.39.2