mirror of
https://github.com/mpv-player/mpv
synced 2025-03-11 04:44:32 +01:00
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
This commit is contained in:
parent
f9e283e091
commit
7ee0eb4e19
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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) {
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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 <steve@daviesfam.org>",
|
||||
"",
|
||||
AF_FLAGS_NOT_REENTRANT,
|
||||
open
|
||||
af_open
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
@ -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
|
||||
};
|
||||
|
@ -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
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user