change demux api:

- demuxers should not access stream->demux_thread_running
- remove deprecated get_video_frame/got_video_frame_cb

CVS patchset: 5732
CVS date: 2003/11/15 14:00:35

1 files changed, 3 insertions, 5 deletions

diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index 270da8838..2013a3d94 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: demux_slave.c,v 1.7 2003/11/11 18:44:53 f1rmb Exp $
+ * $Id: demux_slave.c,v 1.8 2003/11/15 14:01:02 miguelfreitas Exp $
  *
  * demuxer for slave "protocol"
  * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is,
@@ -290,7 +290,7 @@ static void demux_slave_send_headers (demux_plugin_t *this_gen) {
   this->send_newpts = 1;
 }
 
-static int demux_slave_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) {
+static int demux_slave_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time, int playing) {
   demux_slave_t *this = (demux_slave_t *) this_gen;
 
   return this->status;
@@ -380,8 +380,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.dispose           = demux_slave_dispose;
   this->demux_plugin.get_status        = demux_slave_get_status;
   this->demux_plugin.get_stream_length = demux_slave_get_stream_length;
-  this->demux_plugin.get_video_frame   = NULL;
-  this->demux_plugin.got_video_frame_cb= NULL;
   this->demux_plugin.get_capabilities  = demux_slave_get_capabilities;
   this->demux_plugin.get_optional_data = demux_slave_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
@@ -440,6 +438,6 @@ static void *init_plugin (xine_t *xine, void *data) {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "slave", XINE_VERSION_CODE, NULL, init_plugin },
+  { PLUGIN_DEMUX, 23, "slave", XINE_VERSION_CODE, NULL, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };