stream layer cleanup part 2

STREAMTYPE_TV removed, use STREAMTYPE_DUMMY instead. tv init moved to demux_open


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

1 files changed, 5 insertions, 36 deletions

diff --git a/libmpdemux/open.c b/libmpdemux/open.c
index 0bdcaf0a89..c515f6c4c0 100644
--- a/libmpdemux/open.c
+++ b/libmpdemux/open.c
@@ -390,47 +390,16 @@ if(dvd_title){
 }
 #endif
 
+//============ Check for TV-input or multi-file input ====
+  if( (mf_support == 1)
 #ifdef USE_TV
-//============ Check for TV-input ====
-  if (tv_param_on == 1)
-  {
-    tvi_handle_t *tv_handler;
-
-    /* create stream */
-    stream = new_stream(-1, STREAMTYPE_TV);
-    if (!stream)
-	return(NULL);
-
-    /* create tvi handler */
-    tv_handler = tv_begin();
-    if (!tv_handler)
-	return(NULL);
-
-    /* preinit */
-    if (!tv_init(tv_handler))
-	goto tv_err;
-
-    if (!stream_open_tv(stream, tv_handler))
-	goto tv_err;
-
-    stream->priv=tv_handler;
-    
-    return(stream);
-
-    /* something went wrong - uninit */
-tv_err:
-    tv_uninit(tv_handler);
-    return(NULL);
-  }
+   || (tv_param_on == 1)
 #endif
-
-//============ Check for multi file-input ====
-  if (mf_support == 1)
-  {
+  ){
     /* create stream */
     stream = new_stream(-1, STREAMTYPE_DUMMY);
     if (!stream) return(NULL);
-    stream->url=strdup(filename);
+    stream->url=filename?strdup(filename):NULL;
     return(stream);
   }