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, 9 insertions, 9 deletions

diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 376ceee0b..3c7533138 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -1421,7 +1421,7 @@ static int ao_change_settings(aos_t *this, uint32_t bits, uint32_t rate, int mod
                _("stereo not supported by driver, converting to mono.\n"));
     }
  
-    output_sample_rate=this->driver->open(this->driver,bits,(this->force_rate ? this->force_rate : rate),mode);
+    output_sample_rate=(this->driver->open) (this->driver,bits,(this->force_rate ? this->force_rate : rate),mode);
   } else
     output_sample_rate = this->input.rate;
 
diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c
index 053107b6d..d153cada9 100644
--- a/src/xine-engine/post.c
+++ b/src/xine-engine/post.c
@@ -59,7 +59,7 @@ static void post_video_open(xine_video_port_t *port_gen, xine_stream_t *stream)
   _x_post_rewire(port->post);
   _x_post_inc_usage(port);
   if (port->port_lock) pthread_mutex_lock(port->port_lock);
-  port->original_port->open(port->original_port, stream);
+  (port->original_port->open) (port->original_port, stream);
   if (port->port_lock) pthread_mutex_unlock(port->port_lock);
   port->stream = stream;
 }
@@ -205,7 +205,7 @@ static int post_video_rewire(xine_post_out_t *output_gen, void *data) {
   
   if (input_port->original_port->status(input_port->original_port, input_port->stream,
       &width, &height, &img_duration)) {
-    new_port->open(new_port, input_port->stream);
+    (new_port->open) (new_port, input_port->stream);
     input_port->original_port->close(input_port->original_port, input_port->stream);
   }
   input_port->original_port = new_port;
@@ -617,7 +617,7 @@ static int post_audio_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
   _x_post_rewire(port->post);
   _x_post_inc_usage(port);
   if (port->port_lock) pthread_mutex_lock(port->port_lock);
-  result = port->original_port->open(port->original_port, stream, bits, rate, mode);
+  result = (port->original_port->open) (port->original_port, stream, bits, rate, mode);
   if (port->port_lock) pthread_mutex_unlock(port->port_lock);
   port->stream = stream;
   port->bits   = bits;
@@ -719,7 +719,7 @@ static int post_audio_rewire(xine_post_out_t *output_gen, void *data) {
   
   if (input_port->original_port->status(input_port->original_port, input_port->stream,
       &bits, &rate, &mode)) {
-    new_port->open(new_port, input_port->stream, bits, rate, mode);
+    (new_port->open) (new_port, input_port->stream, bits, rate, mode);
     input_port->original_port->close(input_port->original_port, input_port->stream);
   }
   input_port->original_port = new_port;
diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h
index 7ef46536b..9f82ffaa1 100644
--- a/src/xine-engine/post.h
+++ b/src/xine-engine/post.h
@@ -306,7 +306,7 @@ struct post_audio_port_s {
    * these pointers to exist */
   int                usage_count;
   
-  /* some values remembered by port->open() */
+  /* some values remembered by (port->open) () */
   uint32_t           bits;
   uint32_t           rate;
   uint32_t           mode;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 5399dedbd..96f97d94c 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -554,7 +554,7 @@ static int stream_rewire_audio(xine_post_out_t *output, void *data)
   
   if (stream->audio_out->status(stream->audio_out, stream, &bits, &rate, &mode)) {
     /* register our stream at the new output port */
-    new_port->open(new_port, stream, bits, rate, mode);
+    (new_port->open) (new_port, stream, bits, rate, mode);
     stream->audio_out->close(stream->audio_out, stream);
   }
   stream->audio_out = new_port;
@@ -580,7 +580,7 @@ static int stream_rewire_video(xine_post_out_t *output, void *data)
   
   if (stream->video_out->status(stream->video_out, stream, &width, &height, &img_duration)) {
     /* register our stream at the new output port */
-    new_port->open(new_port, stream);
+    (new_port->open) (new_port, stream);
     stream->video_out->close(stream->video_out, stream);
   }
   stream->video_out = new_port;
@@ -868,7 +868,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) {
       _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, 
 			    (stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class)));
 
-      res = stream->input_plugin->open(stream->input_plugin);
+      res = (stream->input_plugin->open) (stream->input_plugin);
       switch(res) {
       case 1: /* Open successfull */
 	free(input_source);