static void remap_mono_to_stereo_c(pa_remap_t *m, void *dst, const void *src, unsigned n) {
unsigned i;
- switch (*m->format) {
+ switch (m->format) {
case PA_SAMPLE_FLOAT32NE:
{
float *d, *s;
unsigned oc, ic, i;
unsigned n_ic, n_oc;
- n_ic = m->i_ss->channels;
- n_oc = m->o_ss->channels;
+ n_ic = m->i_ss.channels;
+ n_oc = m->o_ss.channels;
- switch (*m->format) {
+ switch (m->format) {
case PA_SAMPLE_FLOAT32NE:
{
float *d, *s;
static void init_remap_c(pa_remap_t *m) {
unsigned n_oc, n_ic;
- n_oc = m->o_ss->channels;
- n_ic = m->i_ss->channels;
+ n_oc = m->o_ss.channels;
+ n_ic = m->i_ss.channels;
/* find some common channel remappings, fall back to full matrix operation. */
if (n_ic == 1 && n_oc == 2 &&
}
/* 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) {
- pa_assert(remap_func);
+void pa_init_remap_func(pa_remap_t *m) {
+ pa_assert(init_remap_func);
m->do_remap = NULL;
/* call the installed remap init function */
- remap_func(m);
+ init_remap_func(m);
if (m->do_remap == NULL) {
/* nothing was installed, fallback to C version */
}
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) {
- remap_func = func;
+ init_remap_func = func;
}