ported all network streams to the new API

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15586 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 0 insertions, 66 deletions

diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 3c04f86445..d1723c7b80 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -20,15 +20,6 @@
 #include "demuxer.h"
 #include "mf.h"
 
-#ifdef MPLAYER_NETWORK
-#include "url.h"
-#include "network.h"
-extern int streaming_start( stream_t *stream, int *demuxer_type, URL_t *url);
-#ifdef STREAMING_LIVE_DOT_COM
-#include "demux_rtp.h"
-#endif
-static URL_t* url;
-#endif
 
 /// We keep these 2 for the gui atm, but they will be removed.
 int vcd_track=0;
@@ -37,10 +28,6 @@ char* cdrom_device=NULL;
 // Open a new stream  (stdin/file/vcd/url)
 
 stream_t* open_stream(char* filename,char** options, int* file_format){
-stream_t* stream=NULL;
-int f=-1;
-off_t len;
-
   // Check if playlist or unknown 
   if (*file_format != DEMUXER_TYPE_PLAYLIST){
     *file_format=DEMUXER_TYPE_UNKNOWN;
@@ -51,59 +38,6 @@ if(!filename) {
    return NULL;
 }
 
-
-#ifdef MPLAYER_NETWORK
-#ifdef STREAMING_LIVE_DOT_COM
-  // Check for a SDP file:
-  if (strncmp("sdp://",filename,6) == 0) {
-       filename += 6;
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-       f=open(filename,O_RDONLY|O_BINARY);
-#else
-       f=open(filename,O_RDONLY);
-#endif
-       if(f<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_FileNotFound,filename);return NULL; }
-
-       len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET);
-       if (len == -1)
-           return NULL;
-
-#ifdef _LARGEFILE_SOURCE
-	 mp_msg(MSGT_OPEN,MSGL_V,"File size is %lld bytes\n", (long long)len);
-#else
-	 mp_msg(MSGT_OPEN,MSGL_V,"File size is %u bytes\n", (unsigned int)len);
-#endif
-	 return stream_open_sdp(f, len, file_format);
-  }
-#endif
-
-  // FIXME: to avoid nonsense error messages...
-  if (strncmp("tv://", filename, 5) && strncmp("mf://", filename, 5) &&
-    strncmp("vcd://", filename, 6) && strncmp("dvb://", filename, 6) &&
-    strncmp("cdda://", filename, 7) && strncmp("cddb://", filename, 7) &&
-    strncmp("mpst://", filename, 7) && strncmp("tivo://", filename, 7) &&
-    strncmp("file://", filename, 7) && strncmp("cue://", filename, 6) &&
-    strncmp("ftp://", filename, 6) && strncmp("smb://", filename, 6) && 
-    strncmp("dvd://", filename, 6) && strncmp("dvdnav://", filename, 9) &&
-    strstr(filename, "://")) {
-     url = url_new(filename);
-    }
-  if(url) {
-        stream=new_stream(f,STREAMTYPE_STREAM);
-	if( streaming_start( stream, file_format, url )<0){
-          mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename);
-	  url_free(url);
-	  url = NULL;
-	  return NULL;
-	} else {
-        mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname );
-	url_free(url);
-	url = NULL;
-	return stream;
-	}
-  }
-#endif
-
 //============ Open STDIN or plain FILE ============
 
   return open_stream_full(filename,STREAM_READ,options,file_format);