* all: use net_*.

modules/access/mms/mms.c

@@ -2,7 +2,7 @@
  * mms.c: MMS over tcp, udp and http access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mms.c,v 1.34 2003/05/15 22:27:36 massiot Exp $
+ * $Id: mms.c,v 1.35 2004/01/21 16:56:16 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -69,11 +69,6 @@ vlc_module_begin();
         add_bool( "mms-all", 0, NULL,
                   "force selection of all streams",
                   "force selection of all streams", VLC_TRUE );
-#if 0
-        add_string( "mms-stream", NULL, NULL,
-                    "streams selection",
-                    "force this stream selection", VLC_TRUE );
-#endif
         add_integer( "mms-maxbitrate", 0, NULL,
                      "max bitrate",
                      "set max bitrate for auto streams selections", VLC_FALSE );
@@ -89,9 +84,14 @@ static int Open( vlc_object_t *p_this )
 {
     input_thread_t  *p_input = (input_thread_t*)p_this;
 
-    int i_err;
+    /* First set ipv4/ipv6 */
+    var_Create( p_input, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Create( p_input, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 
+    /* mms-caching */
+    var_Create( p_input, "mms-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
+    /* use specified method */
     if( *p_input->psz_access )
     {
         if( !strncmp( p_input->psz_access, "mmsu", 4 ) )
@@ -108,15 +108,12 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
-
-    i_err = E_( MMSTUOpen )( p_input );
-
-    if( i_err )
+    if( E_( MMSTUOpen )( p_input ) )
     {
-        i_err = E_( MMSHOpen )( p_input );
+        /* try mmsh if mmstu failed */
+        return E_( MMSHOpen )( p_input );
     }
-
-    return i_err;
+    return VLC_SUCCESS;
 }
 
 /*****************************************************************************

modules/access/mms/mmsh.h

@@ -2,7 +2,7 @@
  * mmsh.h:
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mmsh.h,v 1.4 2003/08/26 00:51:19 fenrir Exp $
+ * $Id: mmsh.h,v 1.5 2004/01/21 16:56:16 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -36,14 +36,12 @@ typedef struct
 
 } chunk_t;
 
-static int chunk_parse( chunk_t *, uint8_t *, int );
-
 #define BUFFER_SIZE 150000
 struct access_sys_t
 {
     int             i_proto;
 
-    input_socket_t  *p_socket;
+    int             fd;
     url_t           *p_url;
 
     int             i_request_context;
@@ -68,14 +66,6 @@ struct access_sys_t
     guid_t          guid;
 };
 
-static input_socket_t * NetOpenTCP  ( input_thread_t *, url_t * );
-static ssize_t          NetRead     ( input_thread_t *, input_socket_t *, byte_t *, size_t );
-static ssize_t          NetWrite    ( input_thread_t *, input_socket_t *, byte_t *, size_t );
-static void             NetClose    ( input_thread_t *, input_socket_t * );
-
-
-static ssize_t NetFill( input_thread_t *, access_sys_t *, int );
-
 typedef struct http_field_s
 {
     char *psz_name;
@@ -98,10 +88,4 @@ typedef struct
 
 } http_answer_t;
 
-static http_answer_t    *http_answer_parse  ( uint8_t *, int );
-static void              http_answer_free   ( http_answer_t * );
-/* static char             *http_field_get_value   ( http_answer_t *, char * ); */
-static http_field_t     *http_field_find    ( http_field_t *, char * );
 
-static int  mmsh_start( input_thread_t *, off_t );
-static void mmsh_stop ( input_thread_t * );