Update NEWS, LIST and improve preferences for the new Sout modules

Rename preferences entries, put in the right categories, etc...

NEWS

@@ -80,8 +80,12 @@ Stream output:
     dst=public_html/iphonestreamfile-###.ts}"
  * RTP: support for Vorbis and Theora
  * Major rework of VoD support
- * New delay module, to introduce delays
- * New setlang, setid and langfromtelx modules
+ * New delay module, to introduce delays of one ES, when streaming:
+       #delay{id=12,delay=500}:standard...
+ * New setlang, setid modules to change lang or id of one ES, when streaming:
+       #setid{id=12,new-id=42}:std...
+ * New langfromtelx module, to change lang of one ES, when streaming, based on
+   a telextex page: #langfromtelx{id=12,magazine=7,page=0x99,row=1}:std...
 
 Services Discovery:
  * Search API to be able to query distant search APIs from the interfaces

modules/LIST

@@ -159,6 +159,8 @@ $Id$
  * libass: Subtitle renderers using libass
  * libbluray: Library to access Blu-Ray drives
  * libmpeg2: Mpeg2 video decoder using libmpeg2
+ * linsys_hdsdi: Linsys HDSDI cards access module
+ * linsys_sdi: Linsys SDI cards access module
  * lirc: Linux infrared control module
  * live555: rtp demux based on liveMedia (live555.com)
  * logger: file logger plugin
@@ -288,16 +290,19 @@ $Id$
  * stream_filter_record: record any stream instantly
  * stream_out_autodel: monitor mux inputs and automatically add/delete streams
  * stream_out_bridge: "exchange" streams between sout instances. To be used with VLM
+ * stream_out_delay: introduce delay in an ES when streaming
  * stream_out_description: helper module for RTSP vod
  * stream_out_display: displays a stream output chain
  * stream_out_dummy: dummy stream out chain module
  * stream_out_duplicate: duplicates a stream output chain
  * stream_out_es: stream out module outputing ES
  * stream_out_gather: stream out module gathering inputs for seemless transitions
+ * stream_out_langfromtelx: set the the Lang of an ES when streaming based on a teletext page
  * stream_out_mosaic_bridge: stream output module to make a mosaic. To be used with VLM
  * stream_out_raop: Remote Audio Output Protocol (AirTunes) stream out
  * stream_out_record: record stream output module
  * stream_out_rtp: rtp stream output module
+ * stream_out_setid: Set the ID/Lang of an ES when streaming
  * stream_out_smem: stream output module to a memory buffer
  * stream_out_standard: standard stream output module
  * stream_out_switcher: stream output module to display backgrounds

modules/stream_out/delay.c

@@ -36,13 +36,14 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ID_TEXT N_("ID")
+#define ID_TEXT N_("Elementary Stream ID")
 #define ID_LONGTEXT N_( \
     "Specify an identifier integer for this elementary stream" )
 
-#define DELAY_TEXT N_("Delay (ms)")
+#define DELAY_TEXT N_("Delay of the ES (ms)")
 #define DELAY_LONGTEXT N_( \
-    "Specify a delay (in ms) for this elementary stream (positive or negative)" )
+    "Specify a delay (in ms) for this elementary stream. " \
+    "Positive means delay and negative means advance." )
 
 static int  Open    ( vlc_object_t * );
 static void Close   ( vlc_object_t * );
@@ -50,10 +51,12 @@ static void Close   ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-delay-"
 
 vlc_module_begin()
-    set_shortname( _("delay"))
-    set_description( _("Delay a stream"))
+    set_shortname( N_("Delay"))
+    set_description( N_("Delay a stream"))
     set_capability( "sout stream", 50 )
     add_shortcut( "delay" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
     set_callbacks( Open, Close )
     add_integer( SOUT_CFG_PREFIX "id", 0, ID_TEXT, ID_LONGTEXT,
                  false )

modules/stream_out/display.c

@@ -57,6 +57,7 @@ vlc_module_begin ()
     add_shortcut( "display" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
+
     add_bool( SOUT_CFG_PREFIX "audio", true, AUDIO_TEXT,
               AUDIO_LONGTEXT, true )
     add_bool( SOUT_CFG_PREFIX "video", true, VIDEO_TEXT,

modules/stream_out/langfromtelx.c

@@ -38,7 +38,8 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ID_TEXT N_("ID")
+
+#define ID_TEXT N_("Elementary Stream ID")
 #define ID_LONGTEXT N_( \
     "Specify an identifier integer for this elementary stream to change" )
 #define MAGAZINE_TEXT N_("Magazine")
@@ -57,10 +58,13 @@ static void Close   ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-langfromtelx-"
 
 vlc_module_begin()
-    set_shortname( _("langfromtelx"))
-    set_description( _("Dynamic language setting from telx"))
+    set_shortname( N_("Lang From Telx"))
+    set_description( N_("Dynamic language setting from teletext"))
     set_capability( "sout stream", 50 )
     add_shortcut( "langfromtelx" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+
     set_callbacks( Open, Close )
     add_integer( SOUT_CFG_PREFIX "id", 0, ID_TEXT, ID_LONGTEXT,
                  false )

modules/stream_out/setid.c

@@ -38,11 +38,11 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ID_TEXT N_("ID")
+#define ID_TEXT N_("Elementary Stream ID")
 #define ID_LONGTEXT N_( \
     "Specify an identifier integer for this elementary stream" )
 
-#define NEWID_TEXT N_("New ID")
+#define NEWID_TEXT N_("New ES ID")
 #define NEWID_LONGTEXT N_( \
     "Specify an new identifier integer for this elementary stream" )
 
@@ -58,19 +58,22 @@ static void Close     ( vlc_object_t * );
 #define SOUT_CFG_PREFIX_LANG "sout-setlang-"
 
 vlc_module_begin()
-    set_shortname( _("setid"))
-    set_description( _("Automatically add/delete input streams"))
+    set_shortname( N_("Set ID"))
+    set_section( N_("Set ES id"), NULL )
+    set_description( N_("Change the id of an elementary stream"))
     set_capability( "sout stream", 50 )
     add_shortcut( "setid" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
     set_callbacks( OpenId, Close )
     add_integer( SOUT_CFG_PREFIX_ID "id", 0, ID_TEXT, ID_LONGTEXT, false )
     add_integer( SOUT_CFG_PREFIX_ID "new-id", 0, NEWID_TEXT, NEWID_LONGTEXT,
                  false )
 
     add_submodule ()
-    set_section( N_("setlang"), NULL )
-    set_shortname( _("setlang"))
-    set_description( _("Automatically add/delete input streams"))
+    set_section( N_("Set ES Lang"), NULL )
+    set_shortname( N_("Set Lang"))
+    set_description( N_("Change the language of an elementary stream"))
     set_capability( "sout stream", 50 )
     add_shortcut( "setlang" );
     set_callbacks( OpenLang, Close )