diff libmpdemux/demuxer.c @ 7329:9129781e5939

removed messy global 'tv_handle', use stream->priv for that purpose note: i couldn't test it (only compile test) may be broken :( we're going to an unified demuxer API - required for modularization

--- a/libmpdemux/demuxer.c	Sun Sep 08 22:57:23 2002 +0000
+++ b/libmpdemux/demuxer.c	Sun Sep 08 23:00:01 2002 +0000
@@ -157,13 +157,12 @@
 
 #ifdef USE_TV
 #include "tv.h"
-extern tvi_handle_t *tv_handler;
 extern int tv_param_on;
 
-extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds, tvi_handle_t *tvh);
-extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh);
+extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds);
+extern int demux_open_tv(demuxer_t *demuxer);
 #if defined(USE_TV) && defined(HAVE_TV_V4L)
-extern void demux_close_tv(demuxer_t *demuxer, tvi_handle_t *tvh);
+extern void demux_close_tv(demuxer_t *demuxer);
 #endif
 #endif
 
@@ -191,7 +190,7 @@
       demux_close_nuv(demuxer); break;
 #if defined(USE_TV) && defined(HAVE_TV_V4L)
     case DEMUXER_TYPE_TV:
-	demux_close_tv(demuxer, tv_handler); break;
+	demux_close_tv(demuxer); break;
 #endif
 #ifdef HAVE_LIBDV095
     case DEMUXER_TYPE_RAWDV:
@@ -312,7 +311,7 @@
     case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux);
     case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux);
 #ifdef USE_TV
-    case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds, tv_handler);
+    case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds);
 #endif
     case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux);
     case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds);
@@ -994,11 +993,7 @@
  }
 #ifdef USE_TV
  case DEMUXER_TYPE_TV: {
-    if (!demux_open_tv(demuxer, tv_handler))
-    {
-	tv_uninit(tv_handler);
-	return(NULL);
-    }
+    if (!demux_open_tv(demuxer)) return(NULL);
     break;
  }
 #endif