* 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

diff --git a/NEWS b/NEWS
index 8e9276aac21c51d344217a4a34ba8af17824d583..eacdccc3c1a113b6beb0b1257b56b8b8c7d95f45 100644 (file)
--- 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 8d6e16c9cd44b4f1de44f94e45599f1682d4f6fb..13dc518cc5407fc1679399ba728ebfdabb86e57f 100644 (file)
--- 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 1ceab6efb529a4f2d9725678b8f9b89ff4975f04..29c5287c89e1615851717208227f7e81d01c3d1e 100644 (file)
--- 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 d5a7569fc17b21a2bff01d99ddd94bcc87a39a3f..5d6b5300a6a9eea6bf8c3fa4e17af41c95e9b603 100644 (file)
--- 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 ee849944b34ad2255538c61b5967834453daef82..a4f8efc32f14701360548002dc22175e21fc1d2c 100644 (file)
--- 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 5a96e5fd9b7b08f22b334b9c207c67cdc4a3c320..375d1f7f4c48a5a40b07023ae8bd6aa3ff6ac70c 100644 (file)
--- 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 7a1c443bb449ff19a7c1a48f0a55a7569ee6fed7..e0ca0886b8ed29e5b3aa3fe73f0f3526de39c87f 100644 (file)
--- 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 aa483795b6f651c0d75405ac90b82a3d89fbd796..48c9d5036d6599d6c40c2bece32273014fd65b42 100644 (file)
--- 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 d18accd99a888e5712fd517bc6fda4f69741bfe0..4d9cad154d1005f6087048ea10d5b339d17e80cb 100644 (file)
--- 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 );