From 52c3eb69765a0d1070bf240353095c8ff546765b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 11 Jul 2013 21:10:42 +0200
Subject: core: change open_stream and demux_open signature

This removes the dependency on DEMUXER_TYPE_* and the file_format
parameter from the stream open functions.

Remove some of the playlist handling code. It looks like this was
needed only for loading linked mov files with demux_mov (which was
removed long ago).

Delete a minor bit of dead network-related code from stream.c as well.
---
 core/asxparser.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'core/asxparser.c')

diff --git a/core/asxparser.c b/core/asxparser.c
index 17ce6b3e8c..0fc10eb059 100644
--- a/core/asxparser.c
+++ b/core/asxparser.c
@@ -451,7 +451,6 @@ asx_parse_ref(ASX_Parser_t* parser, char** attribs) {
 static void asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs) {
   char *href;
   stream_t* stream;
-  int f=DEMUXER_TYPE_UNKNOWN;
 
   if(parser->deep > 0)
     return;
@@ -461,7 +460,7 @@ static void asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs
     asx_warning_attrib_required(parser,"ENTRYREF" ,"HREF" );
     return;
   }
-  stream=open_stream(href,0,&f);
+  stream=stream_open(href, NULL);
   if(!stream) {
     mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Can't open playlist %s\n",href);
     free(href);
-- 
cgit v1.2.3


From cb45b1c65b2fe4644342db202e5f7b9fb64f2488 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Jul 2013 22:04:44 +0200
Subject: Cleanup some include statements

---
 core/asxparser.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'core/asxparser.c')

diff --git a/core/asxparser.c b/core/asxparser.c
index 0fc10eb059..ec15313547 100644
--- a/core/asxparser.c
+++ b/core/asxparser.c
@@ -27,7 +27,6 @@
 #include "playlist.h"
 #include "playlist_parser.h"
 #include "stream/stream.h"
-#include "demux/demux.h"
 #include "asxparser.h"
 #include "core/mp_msg.h"
 
-- 
cgit v1.2.3