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, 4 insertions, 6 deletions

diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 665b670d6..569a472c1 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_ogg.c,v 1.113 2003/11/11 18:44:52 f1rmb Exp $
+ * $Id: demux_ogg.c,v 1.114 2003/11/15 14:00:54 miguelfreitas Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -1442,7 +1442,7 @@ static void demux_ogg_send_headers (demux_plugin_t *this_gen) {
 }
 
 static int demux_ogg_seek (demux_plugin_t *this_gen,
-			   off_t start_pos, int start_time) {
+			   off_t start_pos, int start_time, int playing) {
 
   demux_ogg_t *this = (demux_ogg_t *) this_gen;
   int i;
@@ -1536,7 +1536,7 @@ static int demux_ogg_seek (demux_plugin_t *this_gen,
   
   this->send_newpts     = 1;
 
-  if( !this->stream->demux_thread_running ) {
+  if( !playing ) {
     
     this->status            = DEMUX_OK;
     this->buf_flag_seek     = 0;
@@ -1688,8 +1688,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   this->demux_plugin.dispose           = demux_ogg_dispose;
   this->demux_plugin.get_status        = demux_ogg_get_status;
   this->demux_plugin.get_stream_length = demux_ogg_get_stream_length;
-  this->demux_plugin.get_video_frame   = NULL;
-  this->demux_plugin.got_video_frame_cb= NULL;
   this->demux_plugin.get_capabilities  = demux_ogg_get_capabilities;
   this->demux_plugin.get_optional_data = demux_ogg_get_optional_data;
   this->demux_plugin.demux_class       = class_gen;
@@ -1756,6 +1754,6 @@ static void *init_class (xine_t *xine, void *data) {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "ogg", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_DEMUX, 23, "ogg", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };