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

This does not touch code in contrib.

4 files changed, 12 insertions, 12 deletions

diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c
index 669a4bc94..a73e8eeee 100644
--- a/src/post/visualizations/fftgraph.c
+++ b/src/post/visualizations/fftgraph.c
@@ -197,7 +197,7 @@ static int fftgraph_rewire_video(xine_post_out_t *output_gen, void *data)
     return 0;
   /* register our stream at the new output port */
   old_port->close(old_port, XINE_ANON_STREAM);
-  new_port->open(new_port, XINE_ANON_STREAM);
+  (new_port->open) (new_port, XINE_ANON_STREAM);
   /* reconnect ourselves */
   this->vo_port = new_port;
   return 1;
@@ -232,7 +232,7 @@ static int fftgraph_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream
   this->data_idx = 0;
   this->sample_counter = 0;
 
-  this->vo_port->open(this->vo_port, XINE_ANON_STREAM);
+  (this->vo_port->open) (this->vo_port, XINE_ANON_STREAM);
   this->metronom->set_master(this->metronom, stream->metronom);
 
   this->fft = fft_new(FFT_BITS);
@@ -284,7 +284,7 @@ static int fftgraph_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream
     }
   }
 
-  return port->original_port->open(port->original_port, stream, bits, rate, mode );
+  return (port->original_port->open) (port->original_port, stream, bits, rate, mode );
 }
 
 static void fftgraph_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) {
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index aef517c59..364421bd1 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -261,7 +261,7 @@ static int fftscope_rewire_video(xine_post_out_t *output_gen, void *data)
     return 0;
   /* register our stream at the new output port */
   old_port->close(old_port, XINE_ANON_STREAM);
-  new_port->open(new_port, XINE_ANON_STREAM);
+  (new_port->open) (new_port, XINE_ANON_STREAM);
   /* reconnect ourselves */
   this->vo_port = new_port;
   return 1;
@@ -292,7 +292,7 @@ static int fftscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream
   this->sample_counter = 0;
   this->fft = fft_new(FFT_BITS);
 
-  this->vo_port->open(this->vo_port, XINE_ANON_STREAM);
+  (this->vo_port->open) (this->vo_port, XINE_ANON_STREAM);
   this->metronom->set_master(this->metronom, stream->metronom);
 
   for (c = 0; c < this->channels; c++) {
@@ -305,7 +305,7 @@ static int fftscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream
     }
   }
 
-  return port->original_port->open(port->original_port, stream, bits, rate, mode );
+  return (port->original_port->open) (port->original_port, stream, bits, rate, mode );
 }
 
 static void fftscope_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) {
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index 9e69fefab..02ebea7da 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -94,7 +94,7 @@ static int fooviz_rewire_video(xine_post_out_t *output_gen, void *data)
     return 0;
   /* register our stream at the new output port */
   old_port->close(old_port, XINE_ANON_STREAM);
-  new_port->open(new_port, XINE_ANON_STREAM);
+  (new_port->open) (new_port, XINE_ANON_STREAM);
   /* reconnect ourselves */
   this->vo_port = new_port;
   return 1;
@@ -120,10 +120,10 @@ static int fooviz_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
   this->data_idx = 0;
   this->sample_counter = 0;
 
-  this->vo_port->open(this->vo_port, XINE_ANON_STREAM);
+  (this->vo_port->open) (this->vo_port, XINE_ANON_STREAM);
   this->metronom->set_master(this->metronom, stream->metronom);
 
-  return port->original_port->open(port->original_port, stream, bits, rate, mode );
+  return (port->original_port->open) (port->original_port, stream, bits, rate, mode );
 }
 
 static void fooviz_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) {
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index 483fc39ab..2c3e7dd45 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -164,7 +164,7 @@ static int oscope_rewire_video(xine_post_out_t *output_gen, void *data)
   if (!data)
     return 0;
   old_port->close(old_port, XINE_ANON_STREAM);
-  new_port->open(new_port, XINE_ANON_STREAM);
+  (new_port->open) (new_port, XINE_ANON_STREAM);
   /* reconnect ourselves */
   this->vo_port = new_port;
   return 1;
@@ -194,10 +194,10 @@ static int oscope_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
   this->sample_counter = 0;
   init_yuv_planes(&this->yuv, OSCOPE_WIDTH, OSCOPE_HEIGHT);
 
-  this->vo_port->open(this->vo_port, XINE_ANON_STREAM);
+  (this->vo_port->open) (this->vo_port, XINE_ANON_STREAM);
   this->metronom->set_master(this->metronom, stream->metronom);
 
-  return port->original_port->open(port->original_port, stream, bits, rate, mode );
+  return (port->original_port->open) (port->original_port, stream, bits, rate, mode );
 }
 
 static void oscope_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) {