From 7ee0eb4e190306a3602ce9fabc960097feaffb89 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 20 Mar 2007 09:46:00 +0000 Subject: Rename open to af_open so as not to conflict with a previous header definition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22764 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af_center.c | 4 ++-- libaf/af_channels.c | 4 ++-- libaf/af_comp.c | 4 ++-- libaf/af_delay.c | 4 ++-- libaf/af_dummy.c | 4 ++-- libaf/af_equalizer.c | 4 ++-- libaf/af_extrastereo.c | 4 ++-- libaf/af_format.c | 4 ++-- libaf/af_gate.c | 4 ++-- libaf/af_hrtf.c | 4 ++-- libaf/af_karaoke.c | 4 ++-- libaf/af_ladspa.c | 6 +++--- libaf/af_lavcresample.c | 4 ++-- libaf/af_pan.c | 4 ++-- libaf/af_resample.c | 4 ++-- libaf/af_sinesuppress.c | 4 ++-- libaf/af_sub.c | 4 ++-- libaf/af_surround.c | 4 ++-- libaf/af_sweep.c | 4 ++-- libaf/af_volnorm.c | 4 ++-- libaf/af_volume.c | 4 ++-- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/libaf/af_center.c b/libaf/af_center.c index b229135d40..484742f623 100644 --- a/libaf/af_center.c +++ b/libaf/af_center.c @@ -90,7 +90,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af_center_t* s; af->control=control; af->uninit=uninit; @@ -113,5 +113,5 @@ af_info_t af_info_center = { "Alex Beregszaszi", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_channels.c b/libaf/af_channels.c index 8fcdb99c85..c38c52af88 100644 --- a/libaf/af_channels.c +++ b/libaf/af_channels.c @@ -268,7 +268,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -288,5 +288,5 @@ af_info_t af_info_channels = { "Anders", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_comp.c b/libaf/af_comp.c index 0ae83fe93b..e3aef9a231 100644 --- a/libaf/af_comp.c +++ b/libaf/af_comp.c @@ -138,7 +138,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -158,5 +158,5 @@ af_info_t af_info_comp = { "Anders", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_delay.c b/libaf/af_delay.c index a362086cb8..b7532da98b 100644 --- a/libaf/af_delay.c +++ b/libaf/af_delay.c @@ -163,7 +163,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -183,7 +183,7 @@ af_info_t af_info_delay = { "Anders", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_dummy.c b/libaf/af_dummy.c index 6eb128d86c..05d51ac191 100644 --- a/libaf/af_dummy.c +++ b/libaf/af_dummy.c @@ -36,7 +36,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -55,5 +55,5 @@ af_info_t af_info_dummy = { "Anders", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_equalizer.c b/libaf/af_equalizer.c index 18d76c5442..7d608edcc8 100644 --- a/libaf/af_equalizer.c +++ b/libaf/af_equalizer.c @@ -219,7 +219,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -239,7 +239,7 @@ af_info_t af_info_equalizer = { "Anders", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_extrastereo.c b/libaf/af_extrastereo.c index 6342e677d4..765ed9da3b 100644 --- a/libaf/af_extrastereo.c +++ b/libaf/af_extrastereo.c @@ -125,7 +125,7 @@ static af_data_t* play_float(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play_s16; @@ -147,5 +147,5 @@ af_info_t af_info_extrastereo = { "Alex Beregszaszi & Pierre Lombard", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_format.c b/libaf/af_format.c index 7c660d3fe3..a64a287d0e 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -306,7 +306,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -325,7 +325,7 @@ af_info_t af_info_format = { "Anders", "", AF_FLAGS_REENTRANT, - open + af_open }; static inline uint32_t load24bit(void* data, int pos) { diff --git a/libaf/af_gate.c b/libaf/af_gate.c index f0e7a3df9f..a8c3e7d5fb 100644 --- a/libaf/af_gate.c +++ b/libaf/af_gate.c @@ -134,7 +134,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -154,5 +154,5 @@ af_info_t af_info_gate = { "Anders", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_hrtf.c b/libaf/af_hrtf.c index e89922ab2b..dc7167d8f7 100644 --- a/libaf/af_hrtf.c +++ b/libaf/af_hrtf.c @@ -589,7 +589,7 @@ static int allocate(af_hrtf_t *s) } /* Allocate memory and set function pointers */ -static int open(af_instance_t* af) +static int af_open(af_instance_t* af) { int i; af_hrtf_t *s; @@ -663,5 +663,5 @@ af_info_t af_info_hrtf = { "ylai", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_karaoke.c b/libaf/af_karaoke.c index 7a9270c378..a1426bb58f 100644 --- a/libaf/af_karaoke.c +++ b/libaf/af_karaoke.c @@ -61,7 +61,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control = control; af->uninit = uninit; af->play = play; @@ -82,5 +82,5 @@ af_info_t af_info_karaoke = { "Reynaldo H. Verdejo Pinochet", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c index 3dc400458b..7239d54f66 100644 --- a/libaf/af_ladspa.c +++ b/libaf/af_ladspa.c @@ -131,7 +131,7 @@ typedef struct af_ladspa_s /* ------------------------------------------------------------------------- */ -static int open(af_instance_t *af); +static int af_open(af_instance_t *af); static int af_ladspa_malloc_failed(char*); /* ------------------------------------------------------------------------- */ @@ -144,7 +144,7 @@ af_info_t af_info_ladspa = { "Ivo van Poorten", "", AF_FLAGS_REENTRANT, - open + af_open }; /* ------------------------------------------------------------------------- */ @@ -936,7 +936,7 @@ static af_data_t* play(struct af_instance_s *af, af_data_t *data) { * \return Either AF_ERROR or AF_OK */ -static int open(af_instance_t *af) { +static int af_open(af_instance_t *af) { af->control=control; af->uninit=uninit; diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c index d5f868bc47..baedbf44c8 100644 --- a/libaf/af_lavcresample.c +++ b/libaf/af_lavcresample.c @@ -164,7 +164,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) return data; } -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af_resample_t *s = calloc(1,sizeof(af_resample_t)); af->control=control; af->uninit=uninit; @@ -186,5 +186,5 @@ af_info_t af_info_lavcresample = { "Michael Niedermayer", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_pan.c b/libaf/af_pan.c index 569a465fa1..1dd4834d51 100644 --- a/libaf/af_pan.c +++ b/libaf/af_pan.c @@ -164,7 +164,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -185,5 +185,5 @@ af_info_t af_info_pan = { "Anders", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_resample.c b/libaf/af_resample.c index 47f07125ab..65d7323783 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -356,7 +356,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -377,6 +377,6 @@ af_info_t af_info_resample = { "Anders", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_sinesuppress.c b/libaf/af_sinesuppress.c index 563f8e27a6..93e1da7abb 100644 --- a/libaf/af_sinesuppress.c +++ b/libaf/af_sinesuppress.c @@ -150,7 +150,7 @@ static af_data_t* play_float(struct af_instance_s* af, af_data_t* data) #endif // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play_s16; @@ -173,5 +173,5 @@ af_info_t af_info_sinesuppress = { "Michael Niedermayer", "", 0, - open + af_open }; diff --git a/libaf/af_sub.c b/libaf/af_sub.c index 4b767397b4..bb6ff81095 100644 --- a/libaf/af_sub.c +++ b/libaf/af_sub.c @@ -153,7 +153,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af_sub_t* s; af->control=control; af->uninit=uninit; @@ -177,5 +177,5 @@ af_info_t af_info_sub = { "Anders", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_surround.c b/libaf/af_surround.c index b03d0d1a2d..7e5cc94b79 100644 --- a/libaf/af_surround.c +++ b/libaf/af_surround.c @@ -250,7 +250,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data){ return data; } -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -271,5 +271,5 @@ af_info_t af_info_surround = "Steve Davies ", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_sweep.c b/libaf/af_sweep.c index 11cfc54d84..6c44cada43 100644 --- a/libaf/af_sweep.c +++ b/libaf/af_sweep.c @@ -70,7 +70,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) return data; } -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ af->control=control; af->uninit=uninit; af->play=play; @@ -87,6 +87,6 @@ af_info_t af_info_sweep = { "Michael Niedermayer", "", AF_FLAGS_REENTRANT, - open + af_open }; diff --git a/libaf/af_volnorm.c b/libaf/af_volnorm.c index eb427dc028..ac288a3358 100644 --- a/libaf/af_volnorm.c +++ b/libaf/af_volnorm.c @@ -311,7 +311,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ int i = 0; af->control=control; af->uninit=uninit; @@ -343,5 +343,5 @@ af_info_t af_info_volnorm = { "Alex Beregszaszi & Pierre Lombard", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; diff --git a/libaf/af_volume.c b/libaf/af_volume.c index 8485af5549..36d8559afb 100644 --- a/libaf/af_volume.c +++ b/libaf/af_volume.c @@ -191,7 +191,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) } // Allocate memory and set function pointers -static int open(af_instance_t* af){ +static int af_open(af_instance_t* af){ int i = 0; af->control=control; af->uninit=uninit; @@ -217,5 +217,5 @@ af_info_t af_info_volume = { "Anders", "", AF_FLAGS_NOT_REENTRANT, - open + af_open }; -- cgit v1.2.3