* all: use sout_ParseCfg.

 (udp-sout-caching has been renamed sout-udp-caching).

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 8f8262b4b4eacc9ea421a19f211bc4a0ee36d37c..2535bde8f046ccdfbc1b16b14db4d7db108cb3dc 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -58,11 +58,14 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
+#define SOUT_CFG_PREFIX "sout-file-"
+
 vlc_module_begin();
     set_description( _("File stream ouput") );
     set_capability( "sout access", 50 );
     add_shortcut( "file" );
     add_shortcut( "stream" );
+    add_bool( SOUT_CFG_PREFIX "append", 0, NULL, "append", "", VLC_TRUE );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -70,6 +73,10 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
+static const char *ppsz_sout_options[] = {
+    "append", NULL
+};
+
 static int Write( sout_access_out_t *, block_t * );
 static int Seek ( sout_access_out_t *, off_t  );
 static int Read ( sout_access_out_t *, block_t * );
@@ -86,6 +93,9 @@ static int Open( vlc_object_t *p_this )
 {
     sout_access_out_t   *p_access = (sout_access_out_t*)p_this;
     int                 i_flags;
+    vlc_value_t         val;
+
+    sout_ParseCfg( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
     if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) )
     {
@@ -99,7 +109,9 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     i_flags = O_RDWR|O_CREAT;
-    if( sout_cfg_find_value( p_access->p_cfg, "append" ) )
+
+    var_Get( p_access, SOUT_CFG_PREFIX "append", &val );
+    if( val.b_bool )
     {
         i_flags |= O_APPEND;
     }

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 3b7e69cfabf0bbca260e93f57ae534f567bf2b78..10ed97248cd172a287b99cb593549acf2c6ad8d4 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -41,11 +41,15 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
+#define SOUT_CFG_PREFIX "sout-http-"
+
 vlc_module_begin();
     set_description( _("HTTP stream ouput") );
     set_capability( "sout access", 0 );
     add_shortcut( "http" );
     add_shortcut( "mmsh" );
+    add_string( SOUT_CFG_PREFIX "user", "", NULL, "User", "", VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "pwd", "", NULL, "Password", "", VLC_TRUE );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -53,6 +57,10 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
+static const char *ppsz_sout_options[] = {
+    "user", "pwd", NULL
+};
+
 static int Write( sout_access_out_t *, block_t * );
 static int Seek ( sout_access_out_t *, off_t  );
 
@@ -84,8 +92,10 @@ static int Open( vlc_object_t *p_this )
     char                *psz_bind_addr;
     int                 i_bind_port;
     char                *psz_file_name;
-
+    char                *psz_user = NULL;
+    char                *psz_pwd = NULL;
     char                *psz_mime = NULL;
+    vlc_value_t         val;
 
     if( !( p_sys = p_access->p_sys =
                 malloc( sizeof( sout_access_out_sys_t ) ) ) )
@@ -94,6 +104,8 @@ static int Open( vlc_object_t *p_this )
         return( VLC_EGENERIC );
     }
 
+    sout_ParseCfg( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
+
     /* p_access->psz_name host.name:port/filename */
     psz_name = psz_parser = strdup( p_access->psz_name );
 
@@ -163,10 +175,24 @@ static int Open( vlc_object_t *p_this )
         psz_mime = "video/x-ms-asf-stream";
     }
 
+    var_Get( p_access, SOUT_CFG_PREFIX "user", &val );
+    if( val.psz_string && *val.psz_string )
+        psz_user = val.psz_string;
+    else if( val.psz_string )
+        free( val.psz_string );
+
+    var_Get( p_access, SOUT_CFG_PREFIX "pwd", &val );
+    if( val.psz_string && *val.psz_string )
+        psz_pwd = val.psz_string;
+    else if( val.psz_string )
+        free( val.psz_string );
+
     p_sys->p_httpd_stream =
         httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
-                         sout_cfg_find_value( p_access->p_cfg, "user" ),
-                         sout_cfg_find_value( p_access->p_cfg, "pwd" ) );
+                         psz_user, psz_pwd );
+    if( psz_user ) free( psz_user );
+    if( psz_pwd ) free( psz_pwd );
+
     if( p_sys->p_httpd_stream == NULL )
     {
         msg_Err( p_access, "cannot add stream %s", psz_file_name );

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index f78ee2c8b75a7f1a1e1bef3f75b1904da8f2f246..710d4d5dc6f3911a51acb043e7d13909fd1c7113 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -58,6 +58,8 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
+#define SOUT_CFG_PREFIX "sout-udp-"
+
 #define CACHING_TEXT N_("Caching value (ms)")
 #define CACHING_LONGTEXT N_( \
     "Allows you to modify the default caching value for udp streams. This " \
@@ -65,8 +67,12 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("UDP stream ouput") );
-    add_integer( "udp-sout-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-                 CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, "ttl", "", VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "group", 1, NULL, "group", "", VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "late", 0, NULL, "late (ms)", "", VLC_TRUE );
+    add_bool( SOUT_CFG_PREFIX "raw",  0, NULL, "raw", "", VLC_TRUE );
+
     set_capability( "sout access", 100 );
     add_shortcut( "udp" );
     add_shortcut( "rtp" ); // Will work only with ts muxer
@@ -76,6 +82,16 @@ vlc_module_end();
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
+
+static const char *ppsz_sout_options[] = {
+    "caching",
+    "ttl",
+    "group",
+    "late",
+    "raw",
+    NULL
+};
+
 static int  Write   ( sout_access_out_t *, block_t * );
 static int  WriteRaw( sout_access_out_t *, block_t * );
 static int  Seek    ( sout_access_out_t *, off_t  );
@@ -133,7 +149,8 @@ static int Open( vlc_object_t *p_this )
     network_socket_t    socket_desc;
 
     vlc_value_t         val;
-    char                *psz_val;
+
+    sout_ParseCfg( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
     if( !( p_sys = p_access->p_sys =
                 malloc( sizeof( sout_access_out_sys_t ) ) ) )
@@ -200,11 +217,10 @@ static int Open( vlc_object_t *p_this )
     socket_desc.i_server_port   = i_dst_port;
     socket_desc.psz_bind_addr   = "";
     socket_desc.i_bind_port     = 0;
-    socket_desc.i_ttl           = 0;
-    if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "ttl" ) ) )
-    {
-        socket_desc.i_ttl = atoi( psz_val );
-    }
+
+    var_Get( p_access, SOUT_CFG_PREFIX "ttl", &val );
+    socket_desc.i_ttl = val.i_int;
+
     p_sys->p_thread->p_private = (void*)&socket_desc;
     if( !( p_network = module_Need( p_sys->p_thread, "network", NULL, 0 ) ) )
     {
@@ -215,27 +231,14 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->p_thread->i_handle = socket_desc.i_handle;
 
-    var_Create( p_this, "udp-sout-caching",
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    var_Get( p_this, "udp-sout-caching", &val );
-    p_sys->p_thread->i_caching = val.i_int * 1000;
-    if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "caching" ) ) )
-    {
-        p_sys->p_thread->i_caching = atoll( psz_val ) * 1000;
-    }
-
-    p_sys->p_thread->i_group = 1;
-    if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "group" ) ) )
-    {
-        p_sys->p_thread->i_group = atoi( psz_val );
-    }
+    var_Get( p_access, SOUT_CFG_PREFIX "caching", &val );
+    p_sys->p_thread->i_caching = (int64_t)val.i_int * 1000;
 
-    p_sys->p_thread->i_late = 0;
-    if( ( psz_val = sout_cfg_find_value( p_access->p_cfg, "late" ) ) )
-    {
-        p_sys->p_thread->i_late = atoll( psz_val ) * 1000;
-    }
+    var_Get( p_access, SOUT_CFG_PREFIX "group", &val );
+    p_sys->p_thread->i_group = val.i_int;
 
+    var_Get( p_access, SOUT_CFG_PREFIX "late", &val );
+    p_sys->p_thread->i_late = (int64_t)val.i_int * 1000;
 
     p_sys->i_mtu = socket_desc.i_mtu;
 
@@ -257,7 +260,8 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_sequence_number = rand()&0xffff;
     p_sys->i_ssrc            = rand()&0xffffffff;
 
-    if( sout_cfg_find( p_access->p_cfg, "raw" ) )
+    var_Get( p_access, SOUT_CFG_PREFIX "raw", &val );
+    if( val.b_bool )
     {
         p_access->pf_write = WriteRaw;
     }