Remove use SAP/TTL cruft

[vlc] / modules / stream_out / standard.c

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index a8a1a32afa7c58efbf52a44641404b5c1aef44ac..51e718b78256bf5ff8259d67fb94e450a820af08 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -28,44 +28,38 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-
-#include "network.h"
+#include <vlc_network.h>
+#include "vlc_url.h"
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 #define ACCESS_TEXT N_("Output access method")
+/// \bug [String] "Output method to use for the stream." 
 #define ACCESS_LONGTEXT N_( \
-    "Allows you to specify the output access method used for the streaming " \
-    "output." )
+    "This is the output access method that will be used." )
 #define MUX_TEXT N_("Output muxer")
+/// \bug [String] "Muxer to use for the stream." 
 #define MUX_LONGTEXT N_( \
-    "Allows you to specify the output muxer method used for the streaming " \
-    "output." )
-#define URL_TEXT N_("Output URL (deprecated)")
-#define URL_LONGTEXT N_( \
-    "Allows you to specify the output URL used for the streaming output." \
-    "Deprecated, use dst instead." )
-
+    "This is the muxer that will be used." )
 #define DST_TEXT N_("Output destination")
+/// \bug [String] "Destination (URL) to use for the stream." 
 #define DST_LONGTEXT N_( \
-    "Allows you to specify the output destination used for the streaming output." )
-
+    "This is the destination (URL) that will be used for the stream." )
 #define NAME_TEXT N_("Session name")
 #define NAME_LONGTEXT N_( \
-    "Name of the session that will be announced with SAP" )
+  "This allows you to specify a name for the session, that will be announced "\
+  "if you choose to use SAP." )
 
 #define GROUP_TEXT N_("Session groupname")
 #define GROUP_LONGTEXT N_( \
-    "Name of the group that will be announced for the session" )
+  "This allows you to specify a group for the session, that will be announced "\
+  "if you choose to use SAP." )
 
 #define SAP_TEXT N_("SAP announcing")
-#define SAP_LONGTEXT N_("Announce this session with SAP")
+#define SAP_LONGTEXT N_("Announce this session with SAP.")
 
 static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
@@ -85,10 +79,9 @@ vlc_module_begin();
                 ACCESS_LONGTEXT, VLC_FALSE );
     add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
                 MUX_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT,
-                URL_LONGTEXT, VLC_FALSE );
     add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
                 DST_LONGTEXT, VLC_FALSE );
+        add_deprecated( SOUT_CFG_PREFIX "url", VLC_FALSE );
 
     add_bool( SOUT_CFG_PREFIX "sap", 0, NULL, SAP_TEXT, SAP_LONGTEXT, VLC_TRUE );
     add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT,
@@ -140,7 +133,7 @@ static int Open( vlc_object_t *p_this )
 
     char                *psz_mux_byext = NULL;
 
-    sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+    config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
                    p_stream->p_cfg );
 
     var_Get( p_stream, SOUT_CFG_PREFIX "access", &val );
@@ -155,13 +148,6 @@ static int Open( vlc_object_t *p_this )
     var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
     psz_url = *val.psz_string ? val.psz_string : NULL;
     if( !*val.psz_string ) free( val.psz_string );
-    if( !psz_url )
-    {
-        /* XXX dst take preference over url (url will be removed later) */
-        var_Get( p_stream, SOUT_CFG_PREFIX "url", &val );
-        psz_url = *val.psz_string ? val.psz_string : NULL;
-        if( !*val.psz_string ) free( val.psz_string );
-    }
 
     p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) );
     p_stream->p_sys->p_session = NULL;
@@ -171,8 +157,8 @@ static int Open( vlc_object_t *p_this )
     /* ext -> muxer name */
     if( psz_url && strrchr( psz_url, '.' ) )
     {
-        /* by extention */
-        static struct { char *ext; char *mux; } exttomux[] =
+        /* by extension */
+        static struct { const char *ext; const char *mux; } exttomux[] =
         {
             { "avi", "avi" },
             { "ogg", "ogg" },
@@ -195,7 +181,7 @@ static int Open( vlc_object_t *p_this )
         char *psz_ext = strrchr( psz_url, '.' ) + 1;
         int  i;
 
-        msg_Dbg( p_this, "extention is %s", psz_ext );
+        msg_Dbg( p_this, "extension is %s", psz_ext );
         for( i = 0; exttomux[i].ext != NULL; i++ )
         {
             if( !strcasecmp( psz_ext, exttomux[i].ext ) )
@@ -204,7 +190,7 @@ static int Open( vlc_object_t *p_this )
                 break;
             }
         }
-        msg_Dbg( p_this, "extention -> mux=%s", psz_mux_byext );
+        msg_Dbg( p_this, "extension -> mux=%s", psz_mux_byext );
     }
 
     /* We fix access/mux to valid couple */
@@ -214,7 +200,7 @@ static int Open( vlc_object_t *p_this )
         if( psz_mux_byext )
         {
             msg_Warn( p_stream,
-                      "no access _and_ no muxer, extention gives file/%s",
+                      "no access _and_ no muxer, extension gives file/%s",
                       psz_mux_byext );
             psz_access = strdup("file");
             psz_mux    = strdup(psz_mux_byext);
@@ -244,7 +230,7 @@ static int Open( vlc_object_t *p_this )
         }
         else
         {
-            msg_Err( p_stream, "no mux specified or found by extention" );
+            msg_Err( p_stream, "no mux specified or found by extension" );
             return VLC_EGENERIC;
         }
     }
@@ -359,10 +345,6 @@ static int Open( vlc_object_t *p_this )
             p_session->psz_uri = strdup( url.psz_host );
             p_session->i_port = url.i_port;
             p_session->psz_sdp = NULL;
-
-            var_Get( p_access, "sout-udp-ttl", &val );
-            p_session->i_ttl = val.i_int ? 
-                val.i_int : config_GetInt( p_sout, "ttl" );
             p_session->i_payload = 33;
             p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;