comparison mplayer.c @ 906:8eca9b7aafae

Changed streaming functions call.

905:4b6f81dbb2da

      printf("Reading from stdin...\n");
      f=0; // 0=stdin
      stream=new_stream(f,STREAMTYPE_STREAM);
  } else {
#ifdef STREAMING
      url = set_url(filename);
      if(url==NULL) {
#endif
       f=open(filename,O_RDONLY);
       if(f<0){ printf("File not found: '%s'\n",filename);return 1; }
       len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET);
       stream=new_stream(f,STREAMTYPE_FILE);
       stream->end_pos=len;
#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 );
        }
        stream=new_stream(f,STREAMTYPE_STREAM);
      }
#endif

906:8eca9b7aafae

      printf("Reading from stdin...\n");
      f=0; // 0=stdin
      stream=new_stream(f,STREAMTYPE_STREAM);
  } 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);
       if(f<0){ printf("File not found: '%s'\n",filename);return 1; }
       len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET);
       stream=new_stream(f,STREAMTYPE_FILE);
       stream->end_pos=len;
#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 );
        }
        stream=new_stream(f,STREAMTYPE_STREAM);
      }
#endif