Changeset 37e87108a37856c3cdbfba1abd7fa69ea6e5894a

Timestamp:

15/02/05 21:29:29 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1108499369 +0000

git-parent:

[a3a82045af334db069cd7cf883b5544bc4fface5]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1108499369 +0000

Message:

* 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

Files:

• NEWS (modified) (5 diffs)
• include/vlc_es_out.h (modified) (1 diff)
• include/vlc_input.h (modified) (1 diff)
• modules/access/dvdnav.c (modified) (2 diffs)
• modules/codec/svcdsub.c (modified) (1 diff)
• modules/gui/wxwindows/open.cpp (modified) (3 diffs)
• src/input/es_out.c (modified) (2 diffs)
• src/input/var.c (modified) (1 diff)
• src/libvlc.h (modified) (3 diffs)

NEWS

@@ -15 +15 @@
- * 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
@@ -25 +30 @@
-
-Decoders / Encoders:
- * AMR decoding via ffmpeg
- * Dirac decoder and encoder
-
+/encoder
-
-Services discovery
@@ -36 +40 @@
-
-Video output:
-S
-
+Video s
+ (png or jpg)
- * Motion detection filter (can trigger playlist actions)
-
@@ -75 +79 @@
-
-IE Plugin:
-
+* 
-
-Translations:
- * Danish
- * Greek
+ * Hindi 
+ * Pashto
+ * Burmese
+ * Tetum
+ * Tagalog
+ * Bengali
-
-Changes between 0.8.0 and 0.8.1:
@@ -105 +115 @@
- * Fixed crash with ODML avi files
- * Fixed autodetection of VCD/SVCD bin files
+ * Supports Kasenna VoD (MPEG2 only) and simulcast streaming
-
-Stream Output:

include/vlc_es_out.h

@@ -34 +34 @@
-    ES_OUT_MODE_NONE,   /* don't select anything */
-    ES_OUT_MODE_ALL,    /* eg for stream output */
-pu
+ub
-    ES_OUT_MODE_PARTIAL /* select programs given after --programs */
-};

include/vlc_input.h

@@ -433 +433 @@
-    INPUT_SET_STATE,            /* arg1= int            res=can fail    */
-
-pu
+ub
-    INPUT_GET_AUDIO_DELAY,      /* arg1 = int* res=can fail */
-    INPUT_SET_AUDIO_DELAY,      /* arg1 = int  res=can fail */

modules/access/dvdnav.c

@@ -255 +255 @@
-    /* Set audio language */
-    psz_code = DemuxGetLanguageCode( p_demux, "audio-language" );
-
+ 
-        DVDNAV_STATUS_OK )
-    {
@@ -262 +262 @@
-        /* We try to fall back to 'en' */
-        if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
-
+ 
-    }
-    free( psz_code );
-
-    /* Set spu language */
-pu
-
+ub
+ 
-        DVDNAV_STATUS_OK )
-    {

modules/codec/svcdsub.c

@@ -250 +250 @@
-        if( !p_input ) return NULL;
-
-pu
+ub
-        {
-            vlc_object_release( p_input );

modules/gui/wxwindows/open.cpp

@@ -675 +675 @@
-    sizer->Add( disc_sub, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-    disc_sub->SetRange( -1, 255 );
-pu
+ub
-    disc_sub->SetValue( i_disc_sub );
-
@@ -832 +832 @@
-
-            if( i_disc_sub >= 0 )
-pu
+ub
-                                             i_disc_sub );
-            break;
@@ -850 +850 @@
-
-            if( i_disc_sub >= 0 )
-pu
+ub
-                                             i_disc_sub );
-

src/input/es_out.c

@@ -163 +163 @@
-    p_sys->i_audio_last = val.i_int;
-
-pu
+ub
-    p_sys->i_sub_last = val.i_int;
-
@@ -175 +175 @@
-    }
-
-pu
+ub
-    p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
-    if( p_sys->ppsz_sub_language )

src/input/var.c

@@ -399 +399 @@
-
-    var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-pu
+ub
-
-    var_Create( p_input, "audio-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-pu
+ub
-
-    var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT );

src/libvlc.h

@@ -379 +379 @@
-    "miscellaneous subpictures options." )
-
-PUMARGIN_TEXT N_("Force SPU
-PU
+UB_MARGIN_TEXT N_("Force subtitle
+UB_
-    "You can use this option to place the subtitles under the movie, " \
-    "instead of over the movie. Try several positions.")
@@ -970 +970 @@
-    add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
-              SUB_FILE_LONGTEXT, VLC_TRUE );
-pumargin", -1, NULL, SPU
-PU
+ub-margin", -1, NULL, SUB_
+UB_
-
-    set_section( N_( "Overlays" ) , NULL );
@@ -995 +995 @@
-    add_integer( "audio-track", -1, NULL,
-                 INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, VLC_FALSE );
-pu
+ub
-                 INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, VLC_FALSE );
-    add_string( "audio-language", "", NULL,
-                 INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, VLC_FALSE );
-pu
+ub
-                 INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT, VLC_FALSE );
-