engine modifications to allow post plugin layer:

* new public output interface xine_{audio,video}_port_t instead of
  xine_{ao,vo}_driver_t, old names kept as aliases for compatibility
* modified the engine to allow multiple streams per output
* renaming of some internal structures according to public changes
* moving SCR out of per-stream-metronom into a global metronom_clock_t
  residing in xine_t and therefore easily available to the output layer
* adapting all available plugins
  (note to external projects: the compiler will help you a lot, if a plugin
  compiles, it is adapted, because all changes add new parameters to some
  functions)
* bump up all interface versions because of xine_t and xine_stream_t changes

CVS patchset: 3312
CVS date: 2002/11/20 11:57:38

1 files changed, 6 insertions, 6 deletions

diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index 902081574..0f75ba631 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -44,7 +44,7 @@
  * Carsten Bormann
  * --------------------------------------------------------------------
  *
- * $Id: gsm610.c,v 1.5 2002/11/12 18:40:53 miguelfreitas Exp $
+ * $Id: gsm610.c,v 1.6 2002/11/20 11:57:46 mroi Exp $
  *
  */
 
@@ -121,7 +121,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
     this->buf_type = buf->type;
 
     this->output_open = this->stream->audio_out->open(this->stream->audio_out,
-      GSM610_SAMPLE_SIZE, this->sample_rate, AO_CAP_MODE_MONO);
+      this->stream, GSM610_SAMPLE_SIZE, this->sample_rate, AO_CAP_MODE_MONO);
   }
 
   /* if the audio still isn't open, bail */
@@ -173,7 +173,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
         audio_buffer->vpts = buf->pts;
         buf->pts = 0;  /* only first buffer gets the real pts */
-        this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer);
+        this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
       }
     } else {
 
@@ -203,7 +203,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
         audio_buffer->vpts = buf->pts;
         buf->pts = 0;  /* only first buffer gets the real pts */
-        this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer);
+        this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream);
       }
     }
   }
@@ -223,7 +223,7 @@ static void gsm610_dispose (audio_decoder_t *this_gen) {
     gsm_destroy(this->gsm_state);
 
   if (this->output_open)
-    this->stream->audio_out->close (this->stream->audio_out);
+    this->stream->audio_out->close (this->stream->audio_out, this->stream);
   this->output_open = 0;
 
   if (this->buf)
@@ -291,6 +291,6 @@ static decoder_info_t dec_info_audio = {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_AUDIO_DECODER, 11, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
+  { PLUGIN_AUDIO_DECODER, 12, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };