Disabled the server argument in udpstream: because it confuses users and is

not of any practical use.

diff --git a/plugins/access/udp.c b/plugins/access/udp.c
index 1bf4c0873b056a2c3ab7d4f48cf0c1e0cbca2410..7f1ccf6876859ebad2f308be4453c39a40985f0a 100644 (file)
--- a/plugins/access/udp.c
+++ b/plugins/access/udp.c
@@ -2,7 +2,7 @@
  * udp.c: raw UDP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.6 2002/03/27 22:15:40 massiot Exp $
+ * $Id: udp.c,v 1.7 2002/03/29 00:14:19 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -231,6 +231,19 @@ static int UDPOpen( input_thread_t * p_input )
     p_input->stream.p_selected_area->i_tell = 0;
     p_input->stream.i_method = INPUT_METHOD_NETWORK;
     vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+    if( *psz_server_addr || i_server_port )
+    {
+        intf_ErrMsg("input warning: this UDP syntax is deprecated ; the server argument will be");
+        intf_ErrMsg("ignored (%s:%d). If you wanted to enter a multicast address",
+                    psz_server_addr, i_server_port);
+        intf_ErrMsg("or local port, type : %s:@%s:%d",
+                    *p_input->psz_access ? p_input->psz_access : "udp",
+                    psz_server_addr, i_server_port );
+
+        i_server_port = 0;
+        psz_server_addr = "";
+    }
  
     intf_WarnMsg( 2, "input: opening server=%s:%d local=%s:%d",
                   psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );

diff --git a/src/interface/main.c b/src/interface/main.c
index 0145b11f7ed91dac2927b6523a29e15b27a5fa7c..9feab8e9287c359db1a2d416183692d1032a7889 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.172 2002/03/28 21:21:51 massiot Exp $
+ * $Id: main.c,v 1.173 2002/03/29 00:14:19 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -936,8 +936,7 @@ static void Usage( const char *psz_module_name )
                 "\n                                 \tDVD device"
                 "\n  [vcd:][device][@[title][,[chapter]]"
                 "\n                                 \tVCD device"
-                "\n  udpstream:[<server>[:<server port>]][@[<bind address>]"
-                      "[:<bind port>]]"
+                "\n  udpstream:[@[<bind address>][:<bind port>]]"
                 "\n                                 \tUDP stream sent by VLS"
                 "\n  vlc:loop                       \tLoop execution of the "
                       "playlist"