X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fudp.c;h=8a316c47dc6e7829f3cbe05bc05ee50e7a182f4d;hb=f189f90f64398ff389a3866a683770503dbd515d;hp=9f922ed06e6146b09c3955b8f9bc4b9af52501e2;hpb=33fbd25396faaa21eb8a80d907fcd3a002c7f4f0;p=vlc

diff --git a/modules/access/udp.c b/modules/access/udp.c
index 9f922ed06e..8a316c47dc 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -46,11 +46,6 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
-    "Caching value for UDP streams. This " \
-    "value should be set in milliseconds." )
-
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
@@ -60,9 +55,6 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
-                 CACHING_LONGTEXT, true )
-        change_safe()
     add_obsolete_integer( "server-port" ) /* since 1.2.0 */
 
     set_capability( "access", 0 )
@@ -88,27 +80,12 @@ static int Open( vlc_object_t *p_this )
     char *psz_parser;
     const char *psz_server_addr, *psz_bind_addr = "";
     int  i_bind_port = 1234, i_server_port = 0;
-    int fam = AF_UNSPEC;
     int fd;
 
     /* Set up p_access */
     access_InitFields( p_access );
     ACCESS_SET_CALLBACKS( NULL, BlockUDP, Control, NULL );
 
-    if (strlen (p_access->psz_access) > 0)
-    {
-        switch (p_access->psz_access[strlen (p_access->psz_access) - 1])
-        {
-            case '4':
-                fam = AF_INET;
-                break;
-
-            case '6':
-                fam = AF_INET6;
-                break;
-        }
-    }
-
     /* Parse psz_name syntax :
      * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
     psz_parser = strchr( psz_name, '@' );
@@ -152,7 +129,7 @@ static int Open( vlc_object_t *p_this )
              psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
 
     fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port,
-                        psz_server_addr, i_server_port, fam, IPPROTO_UDP );
+                        psz_server_addr, i_server_port, IPPROTO_UDP );
     free (psz_name);
     if( fd == -1 )
     {
@@ -161,8 +138,6 @@ static int Open( vlc_object_t *p_this )
     }
     p_access->p_sys = (void *)(intptr_t)fd;
 
-    /* Update default_pts to a suitable value for udp access */
-    var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     return VLC_SUCCESS;
 }
 
@@ -197,7 +172,8 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = var_GetInteger(p_access,"udp-caching") * 1000;
+            *pi_64 = INT64_C(1000)
+                   * var_InheritInteger(p_access, "network-caching");
             break;
 
         /* */