diff options
46 files changed, 70 insertions, 69 deletions
@@ -16,6 +16,7 @@ xine-lib (1.1.8) (Unreleased) * DVB subtitle fixes: deadlock prevention, thread leakage, spec compliance. * Allow the DVB input plugin to timeout if it is receiving no signal. * Fix an audio resampling problem which was causing regular clicking. + * Fix build with recent glibc and a debugging #define. [Bug 1773769] xine-lib (1.1.7) * Support libdca (new name for libdts) by shuffling around the dts.h file. diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c index 9b77cc27d..148f5e62c 100644 --- a/src/combined/decoder_flac.c +++ b/src/combined/decoder_flac.c @@ -259,7 +259,7 @@ flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) 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/combined/decoder_wavpack.c b/src/combined/decoder_wavpack.c index ec14dfbf5..e036e3bf8 100644 --- a/src/combined/decoder_wavpack.c +++ b/src/combined/decoder_wavpack.c @@ -171,7 +171,7 @@ static void wavpack_decode_data (audio_decoder_t *const this_gen, buf_element_t 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/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 816787dc0..675a3847a 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -294,7 +294,7 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_ /* the dxr3 needs a longer prebuffering to have time for its internal decoding */ this->stream->metronom->set_option(this->stream->metronom, METRONOM_PREBUFFER, 90000); - stream->video_out->open(stream->video_out, stream); + (stream->video_out->open) (stream->video_out, stream); class->instance = 1; diff --git a/src/input/vcd/libcdio/_cdio_stream.c b/src/input/vcd/libcdio/_cdio_stream.c index fc1f7fce7..d3b9e0ade 100644 --- a/src/input/vcd/libcdio/_cdio_stream.c +++ b/src/input/vcd/libcdio/_cdio_stream.c @@ -57,7 +57,7 @@ _cdio_stream_open_if_necessary(CdioDataSource *obj) cdio_assert (obj != NULL); if (!obj->is_open) { - if (obj->op.open(obj->user_data)) { + if ((obj->op.open) (obj->user_data)) { cdio_warn ("could not open input stream..."); return false; } else { diff --git a/src/input/vcd/libvcd/stream.c b/src/input/vcd/libvcd/stream.c index 2840a05d6..ccc7cf046 100644 --- a/src/input/vcd/libvcd/stream.c +++ b/src/input/vcd/libvcd/stream.c @@ -59,7 +59,7 @@ _vcd_data_sink_open_if_necessary(VcdDataSink *obj) vcd_assert (obj != NULL); if (!obj->is_open) { - if (obj->op.open(obj->user_data)) + if ((obj->op.open) (obj->user_data)) vcd_error("could not opening output stream..."); else { obj->is_open = 1; @@ -173,7 +173,7 @@ _vcd_data_source_open_if_necessary(VcdDataSource *obj) vcd_assert (obj != NULL); if (!obj->is_open) { - if (obj->op.open(obj->user_data)) + if ((obj->op.open) (obj->user_data)) vcd_error ("could not opening input stream..."); else { #ifdef STREAM_DEBUG diff --git a/src/liba52/xine_a52_decoder.c b/src/liba52/xine_a52_decoder.c index 5435e9664..27480d859 100644 --- a/src/liba52/xine_a52_decoder.c +++ b/src/liba52/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/libdts/xine_dts_decoder.c b/src/libdts/xine_dts_decoder.c index 0ef9afa17..39854600a 100644 --- a/src/libdts/xine_dts_decoder.c +++ b/src/libdts/xine_dts_decoder.c @@ -158,7 +158,7 @@ static void dts_decode_frame (dts_decoder_t *this, int64_t pts, int preview_mode 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)); } @@ -254,7 +254,7 @@ static void dts_decode_frame (dts_decoder_t *this, int64_t pts, int preview_mode 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/libfaad/xine_faad_decoder.c b/src/libfaad/xine_faad_decoder.c index aa528a34d..3ce1852d3 100644 --- a/src/libfaad/xine_faad_decoder.c +++ b/src/libfaad/xine_faad_decoder.c @@ -199,7 +199,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/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index 8ebb5ce64..82e19d2d7 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -271,7 +271,7 @@ static void ff_audio_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->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, this->audio_bits, this->audio_sample_rate, _x_ao_channels2mode(this->audio_channels)); } diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 2c851bae1..91a7abf2b 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -271,7 +271,7 @@ static void dvaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (this->decoder_ok && !(buf->decoder_flags & (BUF_FLAG_HEADER|BUF_FLAG_SPECIAL))) { if (!this->output_open) { - 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->audio_bits, this->audio_sample_rate, _x_ao_channels2mode(this->audio_channels)); } diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 8414875aa..81ee6148e 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -386,7 +386,7 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) set_stream_info(this); } - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->skipframes = 0; diff --git a/src/libmad/xine_mad_decoder.c b/src/libmad/xine_mad_decoder.c index 98695db68..e8801c37a 100644 --- a/src/libmad/xine_mad_decoder.c +++ b/src/libmad/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/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 8c0d176c0..d26b5b24d 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -131,7 +131,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre this->mpeg2.stream = stream; mpeg2_init (&this->mpeg2, stream->video_out); - stream->video_out->open(stream->video_out, stream); + (stream->video_out->open) (stream->video_out, stream); this->mpeg2.force_aspect = this->mpeg2.force_pan_scan = 0; return &this->video_decoder; diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index 9e36772b7..d16e97dbc 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.c @@ -465,7 +465,7 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre this->mpeg2dec = mpeg2_init (); mpeg2_custom_fbuf (this->mpeg2dec, 1); /* <- Force libmpeg2 to use xine frame buffers. */ - stream->video_out->open(stream->video_out, stream); + (stream->video_out->open) (stream->video_out, stream); this->force_aspect = this->force_pan_scan = 0; for(n=0;n<30;n++) this->img_state[n].id=0; diff --git a/src/libmusepack/xine_musepack_decoder.c b/src/libmusepack/xine_musepack_decoder.c index 26c2eddf5..44f2444d6 100644 --- a/src/libmusepack/xine_musepack_decoder.c +++ b/src/libmusepack/xine_musepack_decoder.c @@ -273,7 +273,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, diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index 46974ec8b..24fc5a949 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c @@ -339,7 +339,7 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) { return 0; } - this->stream->audio_out->open(this->stream->audio_out, + (this->stream->audio_out->open) (this->stream->audio_out, this->stream, bits_per_sample, samples_per_sec, diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 7985fdc8f..48fbc6271 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.c @@ -268,7 +268,7 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) { this->rvyuv_custom_message (&cmsg_data, this->context); } - this->stream->video_out->open(this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->frame_size = this->width * this->height; this->frame_buffer = xine_xmalloc (this->width * this->height * 3 / 2); diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index c1672d142..da2883f0f 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -405,7 +405,7 @@ static void qta_init_driver (qta_decoder_t *this, buf_element_t *buf) { this->frame_size = this->wave.nChannels * this->wave.wBitsPerSample / 8; - 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->wave.wBitsPerSample, this->wave.nSamplesPerSec, @@ -936,7 +936,7 @@ static void qtv_init_driver (qtv_decoder_t *this, buf_element_t *buf) { this->codec_initialized = 1; - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); pthread_mutex_unlock(&win32_codec_mutex); diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 99509372e..02cad2d1f 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -657,7 +657,7 @@ static void w32v_init_codec (w32v_decoder_t *this, int buf_type) { this->bufsize = VIDEOBUFSIZE; this->buf = malloc(this->bufsize); - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->outfmt = outfmt; this->decoder_ok = 1; @@ -752,7 +752,7 @@ static void w32v_init_ds_dmo_codec (w32v_decoder_t *this, int buf_type) { this->bufsize = VIDEOBUFSIZE; this->buf = malloc(this->bufsize); - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->outfmt = outfmt; this->decoder_ok = 1; @@ -1181,7 +1181,7 @@ static int w32a_init_audio (w32a_decoder_t *this, if (this->output_open) this->stream->audio_out->close (this->stream->audio_out, this->stream); - 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, in_fmt->nSamplesPerSec, _x_ao_channels2mode(in_fmt->nChannels)); if (!this->output_open) { 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 4f54714c9..700d1ee4d 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -119,7 +119,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/nsf.c b/src/libxineadec/nsf.c index 08a4f1814..31d3b36e8 100644 --- a/src/libxineadec/nsf.c +++ b/src/libxineadec/nsf.c @@ -127,7 +127,7 @@ static void nsf_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, diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index 43bea4cbf..de9585849 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -134,12 +134,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_speex_decoder.c b/src/libxineadec/xine_speex_decoder.c index 034e726a6..e99585fe5 100644 --- a/src/libxineadec/xine_speex_decoder.c +++ b/src/libxineadec/xine_speex_decoder.c @@ -271,7 +271,7 @@ static void speex_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->audio_out->open) (this->stream->audio_out, this->stream, 16, this->rate, diff --git a/src/libxineadec/xine_vorbis_decoder.c b/src/libxineadec/xine_vorbis_decoder.c index eb0883cd9..c7b1e5761 100644 --- a/src/libxineadec/xine_vorbis_decoder.c +++ b/src/libxineadec/xine_vorbis_decoder.c @@ -177,7 +177,7 @@ static void vorbis_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { this->convsize=MAX_NUM_SAMPLES/this->vi.channels; if (!this->output_open) { - 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->vi.rate, diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index 033ce1392..f9a3aa8e0 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1146,7 +1146,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; this->width = (bih->biWidth + 15) & ~0x0f; @@ -1198,7 +1198,7 @@ static void bitplane_decode_data (video_decoder_t *this_gen, init_yuv_planes(&this->yuv_planes, this->width, this->height); init_yuv_planes(&this->yuv_planes_hist, this->width, this->height); - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->decoder_ok = 1; /* load the stream/meta info */ diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c index 01ad84921..385784d5d 100644 --- a/src/libxinevdec/foovideo.c +++ b/src/libxinevdec/foovideo.c @@ -98,7 +98,7 @@ static void foovideo_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); if(this->buf) free(this->buf); diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index df56ba033..f5c2973fd 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -74,7 +74,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { if (!this->video_open) { lprintf("opening video\n"); - this->stream->video_out->open(this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->video_open = 1; } diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 045e98000..4f33e91e6 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -81,7 +81,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { if (!this->video_open) { lprintf("opening video\n"); - this->stream->video_out->open(this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->video_open = 1; } diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 32d809061..aef58be97 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -121,7 +121,7 @@ static void rgb_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; this->width = (bih->biWidth + 3) & ~0x03; @@ -152,7 +152,7 @@ static void rgb_decode_data (video_decoder_t *this_gen, init_yuv_planes(&this->yuv_planes, this->width, this->height); - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); this->decoder_ok = 1; /* load the stream/meta info */ diff --git a/src/libxinevdec/xine_theora_decoder.c b/src/libxinevdec/xine_theora_decoder.c index 237eed0a9..ea968c415 100644 --- a/src/libxinevdec/xine_theora_decoder.c +++ b/src/libxinevdec/xine_theora_decoder.c @@ -337,7 +337,7 @@ static video_decoder_t *theora_open_plugin (video_decoder_class_t *class_gen, xi theora_comment_init (&this->t_comment); theora_info_init (&this->t_info); - stream->video_out->open (stream->video_out, stream); + (stream->video_out->open) (stream->video_out, stream); return &this->theora_decoder; diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index f37ff6ca3..8314765d9 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -92,7 +92,7 @@ static void yuv_decode_data (video_decoder_t *this_gen, } if (buf->decoder_flags & BUF_FLAG_STDHEADER) { /* need to initialize */ - this->stream->video_out->open (this->stream->video_out, this->stream); + (this->stream->video_out->open) (this->stream->video_out, this->stream); bih = (xine_bmiheader *) buf->content; this->width = (bih->biWidth + 3) & ~0x03; diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 054468517..33fd4b7ce 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -307,7 +307,7 @@ static int stretch_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, /* force updating on stretch_port_put_buffer */ this->params_changed = 1; - 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 stretch_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 975d8b79e..bc8cb8025 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -203,7 +203,7 @@ static int upmix_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, pthread_mutex_unlock (&this->lock); - return port->original_port->open(port->original_port, stream, bits, rate, mode ); + return (port->original_port->open) (port->original_port, stream, bits, rate, mode ); } #if 0 diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index ddb52b018..5a8ea9abb 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -159,7 +159,7 @@ static int upmix_mono_port_open(xine_audio_port_t *port_gen, xine_stream_t *stre } } - 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 upmix_mono_port_put_buffer(xine_audio_port_t *port_gen, diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index 9bddf6087..9278db6a9 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -184,7 +184,7 @@ static int volnorm_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, port->rate = rate; port->mode = mode; - 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 volnorm_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 26f8fe1df..f0f8879bc 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.c @@ -493,7 +493,7 @@ static void deinterlace_open(xine_video_port_t *port_gen, xine_stream_t *stream) _x_post_rewire(&this->post); _x_post_inc_usage(port); port->stream = stream; - port->original_port->open(port->original_port, stream); + (port->original_port->open) (port->original_port, stream); this->vo_deinterlace_enabled = !this->cur_method; port->original_port->set_property(port->original_port, XINE_PARAM_VO_DEINTERLACE, diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index 7c2939105..500ae34ea 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.c @@ -365,7 +365,7 @@ static int goom_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; @@ -395,10 +395,10 @@ static int goom_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, this->do_samples_skip = 0; this->left_to_read = NUMSAMPLES; - 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 goom_port_close(xine_audio_port_t *port_gen, xine_stream_t *stream ) { 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 ) { diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 93768224b..fb2f495d5 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 f2e14990b..32c8f9453 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; } @@ -196,7 +196,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; @@ -605,7 +605,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; @@ -706,7 +706,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/xine.c b/src/xine-engine/xine.c index 00f1dc41c..01ca48aa2 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -519,7 +519,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; @@ -543,7 +543,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; @@ -830,7 +830,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); |