[MPlayer-cvslog] r35420 - trunk/stream/asf_streaming.c

[upsuper]

Author: upsuper
Date: Sun Nov 11 00:52:19 2012
New Revision: 35420

Log:
Removing mmsu-related code

MMSU was never supported by MPlayer, and the protocol has been
deprecated. Since the code is not in use at all, Removing it
should not break anything.

Modified:
   trunk/stream/asf_streaming.c

Modified: trunk/stream/asf_streaming.c
==============================================================================
--- trunk/stream/asf_streaming.c	Sat Nov 10 19:52:13 2012	(r35419)
+++ trunk/stream/asf_streaming.c	Sun Nov 11 00:52:19 2012	(r35420)
@@ -63,32 +63,18 @@ static int asf_read_wrapper(int fd, void
 }
 
 // We can try several protocol for asf streaming
-// * first the UDP protcol, if there is a firewall, UDP
-//   packets will not come back, so the mmsu will fail.
-// * Then we can try TCP, but if there is a proxy for
+// * First we can try TCP, but if there is a proxy for
 //   internet connection, the TCP connection will not get
 //   through
 // * Then we can try HTTP.
 //
-// Note: Using 	WMP sequence  MMSU then MMST and then HTTP.
+// Note: Using 	WMP sequence  MMST and then HTTP.
 
 static int asf_streaming_start( stream_t *stream, int *demuxer_type) {
     char *proto = stream->streaming_ctrl->url->protocol;
     int fd = -1;
     int port = stream->streaming_ctrl->url->port;
 
-    // Is protocol mms or mmsu?
-    /*
-    if (!strcasecmp(proto, "mmsu") || !strcasecmp(proto, "mms"))
-    {
-		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/UDP...\n");
-		//fd = asf_mmsu_streaming_start( stream );
-		if( fd>-1 ) return fd; //mmsu support is not implemented yet - using this code
-		mp_msg(MSGT_NETWORK,MSGL_V,"  ===> ASF/UDP failed\n");
-		if( fd==-2 ) return -1;
-	}
-    */
-
     //Is protocol mms or mmst?
     if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
     {
@@ -860,7 +846,7 @@ const stream_info_t stream_info_asf = {
   "Bertrand, Reimar Doeffinger, Albeu",
   "originally based on work by Majormms (is that code still there?)",
   open_s,
-  {"mms", "mmsu", "mmst", "http", "http_proxy", "mmsh", "mmshttp", NULL},
+  {"mms", "mmst", "http", "http_proxy", "mmsh", "mmshttp", NULL},
   NULL,
   0 // Urls are an option string
 };