summaryrefslogtreecommitdiff
path: root/src/libxineadec
diff options
context:
space:
mode:
Diffstat (limited to 'src/libxineadec')
-rw-r--r--src/libxineadec/adpcm.c26
-rw-r--r--src/libxineadec/fooaudio.c9
-rw-r--r--src/libxineadec/gsm610.c12
-rw-r--r--src/libxineadec/logpcm.c10
-rw-r--r--src/libxineadec/roqaudio.c10
5 files changed, 34 insertions, 33 deletions
diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c
index 9bbf6fb69..d86a14a29 100644
--- a/src/libxineadec/adpcm.c
+++ b/src/libxineadec/adpcm.c
@@ -24,7 +24,7 @@
* formats can be found here:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: adpcm.c,v 1.23 2002/11/12 18:40:53 miguelfreitas Exp $
+ * $Id: adpcm.c,v 1.24 2002/11/20 11:57:45 mroi Exp $
*/
#include <stdio.h>
@@ -374,7 +374,7 @@ static void dk3_adpcm_decode_block(adpcm_decoder_t *this, 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);
j += bytes_to_send / 2; /* 2 bytes per sample */
}
@@ -455,7 +455,7 @@ static void dk4_adpcm_decode_block(adpcm_decoder_t *this, 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);
j += bytes_to_send / 2; /* 2 bytes per sample */
}
@@ -565,7 +565,7 @@ static void ms_ima_adpcm_decode_block(adpcm_decoder_t *this,
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);
j += bytes_to_send / 2; /* 2 bytes per sample */
}
@@ -611,7 +611,7 @@ static void qt_ima_adpcm_decode_block(adpcm_decoder_t *this,
audio_buffer->vpts = buf->pts;
buf->pts = 0;
audio_buffer->num_frames = out_ptr / this->channels;
- 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);
/* get a new audio buffer */
audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out);
@@ -676,7 +676,7 @@ static void qt_ima_adpcm_decode_block(adpcm_decoder_t *this,
audio_buffer->vpts = buf->pts;
audio_buffer->num_frames = out_ptr / this->channels;
- 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);
this->size = 0;
}
@@ -818,7 +818,7 @@ static void ms_adpcm_decode_block(adpcm_decoder_t *this, 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);
j += bytes_to_send / 2; /* 2 bytes per sample */
}
@@ -890,7 +890,7 @@ static void smjpeg_adpcm_decode_block(adpcm_decoder_t *this, 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);
i += bytes_to_send / 2; /* 2 bytes per sample */
}
@@ -963,7 +963,7 @@ static void vqa_adpcm_decode_block(adpcm_decoder_t *this, 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);
i += bytes_to_send / 2; /* 2 bytes per sample */
}
@@ -1056,7 +1056,7 @@ static void ea_adpcm_decode_block(adpcm_decoder_t *this, buf_element_t *buf) {
audio_buffer->num_frames = (bytes_to_send / 4);
audio_buffer->vpts = buf->pts;
buf->pts = 0;
- 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);
i += bytes_to_send / 2;
}
@@ -1189,7 +1189,7 @@ static void adpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
printf ("adpcm: opening audio output (%d Hz sampling rate, mode=%d)\n",
this->rate, this->ao_cap_mode);
this->output_open = this->stream->audio_out->open (this->stream->audio_out,
- this->bits_per_sample, this->rate, this->ao_cap_mode);
+ this->stream, this->bits_per_sample, this->rate, this->ao_cap_mode);
}
/* if the audio still isn't open, bail */
@@ -1264,7 +1264,7 @@ static void adpcm_dispose (audio_decoder_t *this_gen) {
adpcm_decoder_t *this = (adpcm_decoder_t *) this_gen;
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->decode_buffer)
@@ -1342,6 +1342,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, "adpcm", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
+ { PLUGIN_AUDIO_DECODER, 12, "adpcm", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index f8b9d938f..6b9ce9cd6 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -21,7 +21,7 @@
* player. It really works too! It will output a continuous sine wave in
* place of the data it should actually send.
*
- * $Id: fooaudio.c,v 1.3 2002/11/12 18:40:53 miguelfreitas Exp $
+ * $Id: fooaudio.c,v 1.4 2002/11/20 11:57:46 mroi Exp $
*/
#include <stdio.h>
@@ -113,6 +113,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
if (!this->output_open) {
this->output_open = this->stream->audio_out->open(
this->stream->audio_out,
+ this->stream,
/* this->bits_per_sample, */
16,
this->sample_rate,
@@ -200,7 +201,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
audio_buffer->num_frames = samples_to_send;
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 {
@@ -242,7 +243,7 @@ static void fooaudio_dispose (audio_decoder_t *this_gen) {
/* close the audio output */
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;
/* free anything that was allocated during operation */
@@ -343,7 +344,7 @@ static decoder_info_t dec_info_audio = {
* will export to the public. */
plugin_info_t xine_plugin_info[] = {
/* { type, API version, "name", version, special_info, init_function }, */
- { PLUGIN_AUDIO_DECODER, 11, "fooaudio", XINE_VERSION_CODE, &dec_info_audio, &init_plugin },
+ { PLUGIN_AUDIO_DECODER, 12, "fooaudio", XINE_VERSION_CODE, &dec_info_audio, &init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
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 }
};
diff --git a/src/libxineadec/logpcm.c b/src/libxineadec/logpcm.c
index ce6366833..b3a85368b 100644
--- a/src/libxineadec/logpcm.c
+++ b/src/libxineadec/logpcm.c
@@ -30,7 +30,7 @@
* http://sox.sourceforge.net/
* which listed the code as being lifted from Sun Microsystems.
*
- * $Id: logpcm.c,v 1.9 2002/11/12 18:40:53 miguelfreitas Exp $
+ * $Id: logpcm.c,v 1.10 2002/11/20 11:57:46 mroi Exp $
*
*/
@@ -178,7 +178,7 @@ static void logpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
if (!this->output_open) {
this->output_open = this->stream->audio_out->open(this->stream->audio_out,
- LOGPCM_BITS_PER_SAMPLE, this->samplerate,
+ this->stream, LOGPCM_BITS_PER_SAMPLE, this->samplerate,
(this->output_channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO);
}
@@ -221,7 +221,7 @@ static void logpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
audio_buffer->num_frames = bytes_to_send / this->output_channels;
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);
}
/* reset internal accumulation buffer */
@@ -243,7 +243,7 @@ static void logpcm_dispose (audio_decoder_t *this_gen) {
logpcm_decoder_t *this = (logpcm_decoder_t *) this_gen;
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)
@@ -307,6 +307,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, "logpcm", XINE_VERSION_CODE, &dec_info_audio, &init_plugin },
+ { PLUGIN_AUDIO_DECODER, 12, "logpcm", XINE_VERSION_CODE, &dec_info_audio, &init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c
index 001349242..bf33aec53 100644
--- a/src/libxineadec/roqaudio.c
+++ b/src/libxineadec/roqaudio.c
@@ -21,7 +21,7 @@
* For more information regarding the RoQ file format, visit:
* http://www.csse.monash.edu.au/~timf/
*
- * $Id: roqaudio.c,v 1.12 2002/11/12 18:40:53 miguelfreitas Exp $
+ * $Id: roqaudio.c,v 1.13 2002/11/20 11:57:46 mroi Exp $
*
*/
@@ -92,7 +92,7 @@ static void roqaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
if (!this->output_open) {
this->output_open = this->stream->audio_out->open(this->stream->audio_out,
- RoQ_AUDIO_BITS_PER_SAMPLE, RoQ_AUDIO_SAMPLE_RATE,
+ this->stream, RoQ_AUDIO_BITS_PER_SAMPLE, RoQ_AUDIO_SAMPLE_RATE,
(this->output_channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO);
}
@@ -141,7 +141,7 @@ static void roqaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
audio_buffer->num_frames =
(buf->size - 8) / this->output_channels;
- 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);
this->size = 0;
}
@@ -162,7 +162,7 @@ static void roqaudio_dispose (audio_decoder_t *this_gen) {
roqaudio_decoder_t *this = (roqaudio_decoder_t *) this_gen;
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)
@@ -238,6 +238,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, "roqaudio", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
+ { PLUGIN_AUDIO_DECODER, 12, "roqaudio", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 02:15:40 +0000