mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remap: Rename pa_init_remap() to pa_init_remap_func()

Browse source 
pa_init_remap_func() only sets the appropriate remapping function, it
does not initialize the pa_remap struct

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-04-16 11:37:50 +02:00 • committed by Peter Meerwald
parent fde3626b77
commit c7190b5fd4
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulsecore/remap.c
View file

@ -179,15 +179,15 @@ static void init_remap_c(pa_remap_t *m) {
} }
/* default C implementation */ /* default C implementation */
static pa_init_remap_func_t remap_func = init_remap_c; static pa_init_remap_func_t init_remap_func = init_remap_c;
void pa_init_remap(pa_remap_t *m) { void pa_init_remap_func(pa_remap_t *m) {
pa_assert(remap_func); pa_assert(init_remap_func);
m->do_remap = NULL; m->do_remap = NULL;
/* call the installed remap init function */ /* call the installed remap init function */
remap_func(m); init_remap_func(m);
if (m->do_remap == NULL) { if (m->do_remap == NULL) {
/* nothing was installed, fallback to C version */ /* nothing was installed, fallback to C version */
@ -196,9 +196,9 @@ void pa_init_remap(pa_remap_t *m) {
} }
pa_init_remap_func_t pa_get_init_remap_func(void) { pa_init_remap_func_t pa_get_init_remap_func(void) {
return remap_func; return init_remap_func;
} }
void pa_set_init_remap_func(pa_init_remap_func_t func) { void pa_set_init_remap_func(pa_init_remap_func_t func) {
remap_func = func; init_remap_func = func;
} }

2
src/pulsecore/remap.h
View file

@ -37,7 +37,7 @@ struct pa_remap {
pa_do_remap_func_t do_remap; pa_do_remap_func_t do_remap;
}; };
void pa_init_remap (pa_remap_t *m); void pa_init_remap_func(pa_remap_t *m);
/* custom installation of init functions */ /* custom installation of init functions */
typedef void (*pa_init_remap_func_t) (pa_remap_t *m); typedef void (*pa_init_remap_func_t) (pa_remap_t *m);

2
src/pulsecore/resampler.c
View file

@ -1150,7 +1150,7 @@ static void calc_map_table(pa_resampler *r) {
pa_xfree(t); pa_xfree(t);
/* initialize the remapping function */ /* initialize the remapping function */
pa_init_remap(m); pa_init_remap_func(m);
} }
/* check if buf's memblock is large enough to hold 'len' bytes; create a /* check if buf's memblock is large enough to hold 'len' bytes; create a