- rework semantics of some buffer flags. check buffer.h for details.

- increase demux and decoder apis
- fix runtime changing of ogg/ogm audio channels
note: i hope i haven't broken any demux->decoder data exchange. please report any problems.

CVS patchset: 6014
CVS date: 2004/01/09 01:26:32

6 files changed, 12 insertions, 12 deletions

diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c
index be936e20f..88953becb 100644
--- a/src/libxineadec/adpcm.c
+++ b/src/libxineadec/adpcm.c
@@ -31,7 +31,7 @@
  *   this is also useful for extracting streams from Playstation discs
  *
  *
- * $Id: adpcm.c,v 1.36 2003/12/14 22:13:24 siggi Exp $
+ * $Id: adpcm.c,v 1.37 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -1370,7 +1370,7 @@ static void xa_adpcm_decode_block(adpcm_decoder_t *this, buf_element_t *buf) {
 static void adpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
   adpcm_decoder_t *this = (adpcm_decoder_t *) this_gen;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     xine_waveformatex *audio_header;
 
     this->rate = buf->decoder_info[1];
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index 724f84a83..8c84b0226 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.10 2003/12/14 22:13:24 siggi Exp $
+ * $Id: fooaudio.c,v 1.11 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -82,7 +82,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
   int64_t samples_to_generate;
   int samples_to_send;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
 
     /* When the engine sends a BUF_FLAG_HEADER flag, it is time to initialize
      * the decoder. The buffer element type has 4 decoder_info fields,
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index ef76c322e..4d600a7cf 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -44,7 +44,7 @@
  * Carsten Bormann
  * --------------------------------------------------------------------
  *
- * $Id: gsm610.c,v 1.13 2003/12/14 22:13:24 siggi Exp $
+ * $Id: gsm610.c,v 1.14 2004/01/09 01:26:34 miguelfreitas Exp $
  *
  */
 
@@ -101,7 +101,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
   audio_buffer_t *audio_buffer;
   int in_ptr;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     this->sample_rate = buf->decoder_info[1];
 
     this->buf = xine_xmalloc(AUDIOBUFSIZE);
diff --git a/src/libxineadec/interplayaudio.c b/src/libxineadec/interplayaudio.c
index 59bb34268..4dd8a4a2e 100644
--- a/src/libxineadec/interplayaudio.c
+++ b/src/libxineadec/interplayaudio.c
@@ -21,7 +21,7 @@
  * For more information regarding the Interplay MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: interplayaudio.c,v 1.6 2003/12/14 22:13:24 siggi Exp $
+ * $Id: interplayaudio.c,v 1.7 2004/01/09 01:26:34 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -121,7 +121,7 @@ static void interplay_decode_data (audio_decoder_t *this_gen, buf_element_t *buf
   int sequence_number;
   int channel_number = 0;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
 
     /* When the engine sends a BUF_FLAG_HEADER flag, it is time to initialize
      * the decoder. The buffer element type has 4 decoder_info fields,
diff --git a/src/libxineadec/logpcm.c b/src/libxineadec/logpcm.c
index b8ecf42c1..a980806fb 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.17 2003/12/14 22:13:24 siggi Exp $
+ * $Id: logpcm.c,v 1.18 2004/01/09 01:26:34 miguelfreitas Exp $
  *
  */
 
@@ -151,7 +151,7 @@ static void logpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
   int i;
   int bytes_to_send;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
 
     this->samplerate = buf->decoder_info[1];
     this->output_channels = buf->decoder_info[3];
diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c
index 4bd8455bb..ba2f683d4 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.20 2003/12/14 22:13:25 siggi Exp $
+ * $Id: roqaudio.c,v 1.21 2004/01/09 01:26:34 miguelfreitas Exp $
  *
  */
 
@@ -75,7 +75,7 @@ static void roqaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
   int predictor[2];
   int channel_number = 0;
 
-  if (buf->decoder_flags & BUF_FLAG_HEADER) {
+  if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
     this->output_channels = buf->decoder_info[3];
 
     this->buf = xine_xmalloc(AUDIOBUFSIZE);