[Mplayer-cvslog] CVS: main/libmpdemux asf_streaming.c,1.34,1.35

[Bertrand Baudet]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv17424

Modified Files:
	asf_streaming.c 
Log Message:
- Now mmst will use the MMS/TCP implementation first, instead of trying 
  MMS/HTTP first.
- Fixed a bug when reporting ASF redirector for a text/html payload, was 
  generating a seg fault in playtree.


Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- asf_streaming.c	29 Oct 2002 09:18:53 -0000	1.34
+++ asf_streaming.c	2 Jan 2003 15:38:26 -0000	1.35
@@ -54,7 +54,7 @@
 	strncpy( proto_s, stream->streaming_ctrl->url->protocol, 10 );
 
 	if( 	!strncasecmp( proto_s, "http", 4) || 
-		!strncasecmp( proto_s, "mms", 3)  ||
+		(!strncasecmp( proto_s, "mms", 3) && strncasecmp( proto_s, "mmst", 4)) || 
 		!strncasecmp( proto_s, "http_proxy", 10)
 		) {
 		mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
@@ -416,10 +416,7 @@
 		!strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") ||        // New in Corona, first request
 		!strcasecmp(content_type, "application/x-mms-framed") ) {               // New in Corana, second request
 
-		if( features==NULL ) {
-			mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Prerecorded\n");
-			return ASF_Prerecorded_e;
-		} else if( strstr(features, "broadcast")) {
+		if( strstr(features, "broadcast") ) {
 			mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Live stream\n");
 			return ASF_Live_e;
 		} else {
@@ -435,6 +432,9 @@
 			if( asf_header_check( http_hdr )==0 ) {
 				mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
 				return ASF_PlainText_e;
+			} else if( (!strcasecmp(content_type, "text/html")) ) {
+				mp_msg(MSGT_NETWORK,MSGL_V,"=====> HTML, mplayer is not a browser...yet!\n");
+				return ASF_Unknown_e;
 			} else {
 				mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Redirector\n");
 				return ASF_Redirector_e;