From 46ae846897316e0a89569da6a6c687c59c1842b8 Mon Sep 17 00:00:00 2001 From: bertrand Date: Sat, 19 Jan 2002 09:04:02 +0000 Subject: Moved network related code from open.c to network.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4252 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/open.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'libmpdemux/open.c') diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 8b135ac997..6165e3e6bb 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -374,24 +374,13 @@ tv_err: #ifdef STREAMING url = url_new(filename); if(url) { - streaming_ctrl_t *streaming_ctrl; - streaming_ctrl = streaming_ctrl_new(); - if( streaming_ctrl==NULL ) return NULL; - url = check4proxies( url ); - streaming_ctrl->url = url_copy( url ); - if( autodetectProtocol( streaming_ctrl, &f, file_format )<0 ) { - mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_UnableOpenURL, filename ); - return NULL; - } - mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname ); stream=new_stream(f,STREAMTYPE_STREAM); - stream->streaming_ctrl = streaming_ctrl; - //if( streaming_start( stream , url, *file_format )<0){ - if( streaming_start( stream, *file_format )<0){ + if( streaming_start( stream, *file_format, url )<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename); - url_free(url); + url_free(url); return NULL; } + mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname ); url_free(url); return stream; } -- cgit v1.2.3