Added rate master and divisor. Moved OSS compatibility stuff out of asound.h. Added...

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 9a4b80f7a38abbdfd0c421d8448e2fcdaa6f64d2..7b23a0b505b8f8624c97473997ddeaec7e8c0356 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -372,7 +372,7 @@ int snd_pcm_dump_setup(snd_pcm_t *handle, FILE *fp)
        fprintf(fp, "mode: %s\n", assoc(setup->mode, modes));
        fprintf(fp, "format: %s\n", assoc(setup->format.format, fmts));
        fprintf(fp, "channels: %d\n", setup->format.channels);
-       fprintf(fp, "rate: %d\n", setup->format.rate);
+       fprintf(fp, "rate: %d (%d/%d=%g)\n", setup->format.rate, setup->rate_master, setup->rate_divisor, (double) setup->rate_master / setup->rate_divisor);
        // digital
        fprintf(fp, "start_mode: %s\n", assoc(setup->start_mode, starts));
        fprintf(fp, "xrun_mode: %s\n", assoc(setup->xrun_mode, xruns));

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 97b7a4925b00602bbd66bffad63eb2e4031308b7..0ed01bfd0e778eda76f0749597838c8e9467dc96 100644 (file)
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -254,6 +254,9 @@ static int snd_pcm_plug_setup(void *private, snd_pcm_setup_t *setup)
                setup->format = plug->first->src_format;
        else
                setup->format = plug->last->dst_format;
+       /* FIXME: this is not exact */
+       setup->rate_master = setup->format.rate;
+       setup->rate_divisor = 1;
        err = snd_pcm_plug_alloc(plug, setup->frag_size);
        if (err < 0)
                return err;