Merge branch 'master' into lpcm_encoder

[vlc] / modules / access / udp.c

diff --git a/modules/access/udp.c b/modules/access/udp.c
index ac84535f066b1a229f9e8ae91be9831c1f324013..d243a290eac32e8dbdfd9159b0651d5c81fd3a5d 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -23,9 +23,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -61,15 +61,11 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
     add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
-                 CACHING_LONGTEXT, true );
-    add_obsolete_integer( "rtp-late" )
-    add_obsolete_bool( "udp-auto-mtu" )
+                 CACHING_LONGTEXT, true )
+        change_safe()
 
     set_capability( "access", 0 )
-    add_shortcut( "udp" )
-    add_shortcut( "udpstream" )
-    add_shortcut( "udp4" )
-    add_shortcut( "udp6" )
+    add_shortcut( "udp", "udpstream", "udp4", "udp6" )
 
     set_callbacks( Open, Close )
 vlc_module_end ()
@@ -89,7 +85,7 @@ static int Open( vlc_object_t *p_this )
 {
     access_t     *p_access = (access_t*)p_this;
 
-    char *psz_name = strdup( p_access->psz_path );
+    char *psz_name = strdup( p_access->psz_location );
     char *psz_parser;
     const char *psz_server_addr, *psz_bind_addr = "";
     int  i_bind_port, i_server_port = 0;
@@ -114,7 +110,7 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
-    i_bind_port = var_CreateGetInteger( p_access, "server-port" );
+    i_bind_port = var_InheritInteger( p_access, "server-port" );
 
     /* Parse psz_name syntax :
      * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
@@ -204,7 +200,7 @@ 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 = var_GetInteger(p_access,"udp-caching") * 1000;
             break;
 
         /* */