Merge open()/glibc (debug #define) workaround from 1.1; fix up for 1.2 changes.

This does not touch code in contrib.

8 files changed, 11 insertions, 11 deletions

diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index be2903dd0..33beb3104 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -110,7 +110,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
   /* if the audio output is not open yet, open the audio output */
 #warning: Audio output is hardcoded to mono 16-bit PCM
   if (!this->output_open) {
-    this->output_open = this->stream->audio_out->open(
+    this->output_open = (this->stream->audio_out->open) (
       this->stream->audio_out,
       this->stream,
 /*      this->bits_per_sample, */
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index e144c5bbf..d26dc54ad 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -118,7 +118,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
     this->gsm_state = gsm_create();
     this->buf_type = buf->type;
 
-    this->output_open = this->stream->audio_out->open(this->stream->audio_out,
+    this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
       this->stream, GSM610_SAMPLE_SIZE, this->sample_rate, AO_CAP_MODE_MONO);
   }
 
diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c
index f6fa8a9a3..2a9214f75 100644
--- a/src/libxineadec/xine_a52_decoder.c
+++ b/src/libxineadec/xine_a52_decoder.c
@@ -275,7 +275,7 @@ static void a52dec_decode_frame (a52dec_decoder_t *this, int64_t pts, int previe
 	this->stream->audio_out->close (this->stream->audio_out, this->stream);
 
 
-      this->output_open = this->stream->audio_out->open (this->stream->audio_out, 
+      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, 
 							 this->stream, 16,
 							 this->a52_sample_rate,
 							 output_mode) ;
@@ -373,7 +373,7 @@ static void a52dec_decode_frame (a52dec_decoder_t *this, int64_t pts, int previe
 
       a52_syncinfo (this->frame_buffer, &flags, &sample_rate, &bit_rate);
 
-      this->output_open = this->stream->audio_out->open (this->stream->audio_out,
+      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
 						 this->stream, 16,
 						 sample_rate,
 						 AO_CAP_MODE_A52) ;
diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c
index 000adaa85..b7b55c85c 100644
--- a/src/libxineadec/xine_dts_decoder.c
+++ b/src/libxineadec/xine_dts_decoder.c
@@ -147,7 +147,7 @@ static void dts_decode_frame (dts_decoder_t *this, const int64_t pts, const int
     if(this->bypass_mode) {
       /* SPDIF digital output */
       if (!this->output_open) {
-        this->output_open = (this->stream->audio_out->open (this->stream->audio_out, this->stream,
+        this->output_open = ((this->stream->audio_out->open) (this->stream->audio_out, this->stream,
                                                             16, this->dts_sample_rate, 
                                                             AO_CAP_MODE_AC5));
       }
@@ -243,7 +243,7 @@ static void dts_decode_frame (dts_decoder_t *this, const int64_t pts, const int
         output_mode = this->ao_flags_map[dts_output_flags & DTS_CHANNEL_MASK];
 
       if (!this->output_open) {
-        this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
+        this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
                                                            16, this->dts_sample_rate, 
                                                            output_mode);
       }
diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c
index 169874a44..72eec08a8 100644
--- a/src/libxineadec/xine_faad_decoder.c
+++ b/src/libxineadec/xine_faad_decoder.c
@@ -200,7 +200,7 @@ static int faad_open_output( faad_decoder_t *this ) {
       break; 
   }
    
-  this->output_open = this->stream->audio_out->open (this->stream->audio_out,
+  this->output_open = (this->stream->audio_out->open) (this->stream->audio_out,
                                              this->stream,
                                              this->bits_per_sample,
                                              this->rate,
diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c
index 88256eb74..ef50d9c51 100644
--- a/src/libxineadec/xine_lpcm_decoder.c
+++ b/src/libxineadec/xine_lpcm_decoder.c
@@ -136,12 +136,12 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
     /* force 24-bit samples into 16 bits for now */
     if (this->bits_per_sample == 24)
-      this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
+      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
                                                16,
                                                this->rate,
                                                this->ao_cap_mode) ;
     else
-      this->output_open = this->stream->audio_out->open (this->stream->audio_out, this->stream,
+      this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream,
                                                this->bits_per_sample,
                                                this->rate,
                                                this->ao_cap_mode) ;
diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c
index 98695db68..e8801c37a 100644
--- a/src/libxineadec/xine_mad_decoder.c
+++ b/src/libxineadec/xine_mad_decoder.c
@@ -234,7 +234,7 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 	    this->output_open = 0;
           }
           if (!this->output_open) {
-	    this->output_open = this->xstream->audio_out->open(this->xstream->audio_out,
+	    this->output_open = (this->xstream->audio_out->open) (this->xstream->audio_out,
 				   this->xstream, 16,
 				   this->frame.header.samplerate, 
 			           mode) ;
diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c
index 51b2a9109..d68583a5b 100644
--- a/src/libxineadec/xine_musepack_decoder.c
+++ b/src/libxineadec/xine_musepack_decoder.c
@@ -281,7 +281,7 @@ static void mpc_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
   
   /* if the audio output is not open yet, open the audio output */
   if (!this->output_open) {
-    this->output_open = this->stream->audio_out->open(
+    this->output_open = (this->stream->audio_out->open) (
       this->stream->audio_out,
       this->stream,
       this->bits_per_sample,