[Mplayer-cvslog] CVS: main mplayer.c,1.128,1.129

[Bertrand Baudet]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv6822

Modified Files:
	mplayer.c 
Log Message:
Changed streaming functions call.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -r1.128 -r1.129
*** mplayer.c	2001/05/27 21:16:09	1.128
--- mplayer.c	2001/05/29 17:16:15	1.129
***************
*** 658,663 ****
    } else {
  #ifdef STREAMING
!       url = set_url(filename);
        if(url==NULL) {
  #endif
         f=open(filename,O_RDONLY);
--- 658,664 ----
    } else {
  #ifdef STREAMING
!       url = url_new(filename);
        if(url==NULL) {
+        // failed to create a new URL, so it's not an URL (or a malformed URL)
  #endif
         f=open(filename,O_RDONLY);
***************
*** 668,683 ****
  #ifdef STREAMING
        } else {
!         if(url->port==0) {
!           if( (!strcasecmp(url->protocol, "mms")) || 
!               (!strcasecmp(url->protocol, "http")) ){
!             url->port=80;
!           }
!         }
!         f=connect2Server(url->hostname, url->port);
!         if( f<0 ) { 
            printf("Unable to open URL: %s\n", filename);
!           free_url(url);
            return 1; 
          } else {
            printf("Connected to server: %s\n", url->hostname );
          }
--- 669,681 ----
  #ifdef STREAMING
        } else {
!         int streaming_protocol;
!         streaming_protocol=autodetectProtocol( url, &f );
!         if( streaming_protocol==STREAMING_TYPE_UNKNOWN ) { 
            printf("Unable to open URL: %s\n", filename);
!           url_free(url);
            return 1; 
          } else {
+           f=streaming_start( &url, f, streaming_protocol );
+           if(f<0){ printf("Unable to open URL: %s\n", url->url); return 1; }
            printf("Connected to server: %s\n", url->hostname );
          }


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog