From 0203d4d00bbbb36d4b692e233d73e43ebc93ec6f Mon Sep 17 00:00:00 2001 From: Alexandre Ratchov Date: Sun, 11 Nov 2012 01:01:50 +0100 Subject: [PATCH] remove dsp debug traces --- sndiod/dev.c | 44 +-------------------- sndiod/dsp.c | 109 --------------------------------------------------- 2 files changed, 1 insertion(+), 152 deletions(-) diff --git a/sndiod/dev.c b/sndiod/dev.c index 6346412..bb5817c 100644 --- a/sndiod/dev.c +++ b/sndiod/dev.c @@ -1718,27 +1718,6 @@ slot_attach(struct slot *s) s->mix.resampbuf = xmalloc(d->round * slot_nch * sizeof(adata_t)); } -#ifdef DEBUG - if (log_level >= 3) { - log_puts("play: cc = "); - log_puti(s->mix.cmap.nch); - log_puts(", dev_nch = "); - log_puti(dev_nch); - log_puts(", slot = "); - log_puti(s->mix.slot_cmin); - log_puts(":"); - log_puti(s->mix.slot_cmax); - log_puts(", dev = "); - log_puti(s->mix.dev_cmin); - log_puts(":"); - log_puti(s->mix.dev_cmax); - log_puts(", join = "); - log_puti(s->mix.join); - log_puts(", expand = "); - log_puti(s->mix.expand); - log_puts("\n"); - } -#endif s->mix.drop = 0; s->mix.vol = MIDI_TO_ADATA(s->vol); dev_mix_adjvol(d); @@ -1772,28 +1751,7 @@ slot_attach(struct slot *s) s->sub.encbuf = xmalloc(d->round * slot_nch * sizeof(adata_t)); } - -#ifdef DEBUG - if (log_level >= 3) { - log_puts("sub: cc = "); - log_puti(s->sub.cmap.nch); - log_puts(", dev_nch = "); - log_puti(dev_nch); - log_puts(", slot "); - log_puti(s->sub.slot_cmin); - log_puts(":"); - log_puti(s->sub.slot_cmax); - log_puts(", join = "); - log_puti(s->sub.join); - log_puts(", expand = "); - log_puti(s->sub.expand); - log_puts(", dev = "); - log_puti(s->sub.dev_cmin); - log_puts(":"); - log_puti(s->sub.dev_cmax); - log_puts("\n"); - } -#endif + /* * N-th recorded block is the N-th played block */ diff --git a/sndiod/dsp.c b/sndiod/dsp.c index 1bce392..22ec2ad 100644 --- a/sndiod/dsp.c +++ b/sndiod/dsp.c @@ -232,17 +232,6 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo) /* * Start conversion. */ -#ifdef DEBUG - if (log_level >= 4) { - log_puts("resamp: starting diff = "); - log_puti(diff); - log_puts(", ifr = "); - log_putu(ifr); - log_puts(", ofr = "); - log_putu(ofr); - log_puts(" fr\n"); - } -#endif for (;;) { if (diff < 0) { if (ifr == 0) @@ -306,15 +295,6 @@ resamp_init(struct resamp *p, unsigned int iblksz, unsigned int oblksz, int nch) p->ctx_start = 0; for (i = 0; i < NCHAN_MAX * RESAMP_NCTX; i++) p->ctx[i] = 0; -#ifdef DEBUG - if (log_level >= 3) { - log_puts("resamp: init "); - log_putu(iblksz); - log_puts("/"); - log_putu(oblksz); - log_puts("\n"); - } -#endif } void @@ -331,13 +311,6 @@ enc_do(struct conv *p, unsigned char *in, unsigned char *out, int todo) int obnext; int osnext; -#ifdef DEBUG - if (log_level >= 4) { - log_puts("enc: bcopy "); - log_putu(todo); - log_puts("\n"); - } -#endif /* * Partially copy structures into local variables, to avoid * unnecessary indirections; this also allows the compiler to @@ -381,13 +354,6 @@ enc_sil_do(struct conv *p, unsigned char *out, int todo) int obnext; int osnext; -#ifdef DEBUG - if (log_level >= 4) { - log_puts("enc: silence "); - log_putu(todo); - log_puts("\n"); - } -#endif /* * Partially copy structures into local variables, to avoid * unnecessary indirections; this also allows the compiler to @@ -434,15 +400,6 @@ enc_init(struct conv *p, struct aparams *par, int nch) p->bnext = 1; p->snext = 0; } -#ifdef DEBUG - if (log_level >= 3) { - log_puts("enc_init: "); - aparams_log(par); - log_puts(", "); - log_puti(p->nch); - log_puts(" channels\n"); - } -#endif } void @@ -459,13 +416,6 @@ dec_do(struct conv *p, unsigned char *in, unsigned char *out, int todo) unsigned int ishift; adata_t *odata; -#ifdef DEBUG - if (log_level >= 4) { - log_puts("dec: bcopy "); - log_putu(todo); - log_puts("\n"); - } -#endif /* * Partially copy structures into local variables, to avoid * unnecessary indirections; this also allows the compiler to @@ -517,15 +467,6 @@ dec_init(struct conv *p, struct aparams *par, int nch) p->bnext = 1; p->snext = 0; } -#ifdef DEBUG - if (log_level >= 3) { - log_puts("dec_init "); - aparams_log(par); - log_puts(", "); - log_puti(p->nch); - log_puts(" channels\n"); - } -#endif } void @@ -534,13 +475,6 @@ cmap_add(struct cmap *p, void *in, void *out, int vol, int todo) adata_t *idata, *odata; int i, j, nch, istart, inext, onext, ostart, y, v; -#ifdef DEBUG - if (log_level >= 4) { - log_puts("cmap: add of "); - log_puti(todo); - log_puts(" frames\n"); - } -#endif idata = in; odata = out; ostart = p->ostart; @@ -577,13 +511,6 @@ cmap_copy(struct cmap *p, void *in, void *out, int vol, int todo) adata_t *idata, *odata; int i, j, nch, istart, inext, onext, ostart, v; -#ifdef DEBUG - if (log_level >= 4) { - log_puts("cmap: copy of "); - log_puti(todo); - log_puts(" frames\n"); - } -#endif idata = in; odata = out; ostart = p->ostart; @@ -643,42 +570,6 @@ cmap_init(struct cmap *p, p->istart = cmin - imin; p->inext = imax - cmax; p->nch = cmax - cmin + 1; -#ifdef DEBUG - if (log_level >= 3) { - log_puts("cmap_init: "); - log_puti(isubmin); - log_puts(":"); - log_puti(isubmax); - log_puts(" in "); - log_puti(imin); - log_puts(":"); - log_puti(imax); - log_puts(" --> "); - log_puti(osubmin); - log_puts(":"); - log_puti(osubmax); - log_puts(" in "); - log_puti(omin); - log_puts(":"); - log_puti(omax); - log_puts("\n"); - log_puts("cmap_init: cmin:cmax = "); - log_puti(cmin); - log_puts(":"); - log_puti(cmax); - log_puts(", nch = "); - log_puti(p->nch); - log_puts(", ostart = "); - log_puti(p->ostart); - log_puts(", onext = "); - log_puti(p->onext); - log_puts(", istart = "); - log_puti(p->istart); - log_puts(", inext= "); - log_puti(p->inext); - log_puts("\n"); - } -#endif } /*