summaryrefslogtreecommitdiffstats
path: root/rate
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-02 16:30:06 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-02 16:30:06 +0200
commit76e0c15ce430e4ae04d4cb14760be0bf20365500 (patch)
tree04996b4025879c192f9be5611d331d156591b31f /rate
parente79761b9a0a7e877e4abe772cefbafbed6cf115f (diff)
Add PCM rates query support for PCM rate plugins
Follow the new PCM rate-plugin protocol to support the rate range queries, etc. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'rate')
-rw-r--r--rate/rate_samplerate.c29
1 files changed, 27 insertions, 2 deletions
diff --git a/rate/rate_samplerate.c b/rate/rate_samplerate.c
index e366db0..53a0627 100644
--- a/rate/rate_samplerate.c
+++ b/rate/rate_samplerate.c
@@ -137,6 +137,20 @@ static void pcm_src_close(void *obj)
free(obj);
}
+#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002
+static int get_supported_rates(void *obj, unsigned int *rate_min,
+ unsigned int *rate_max)
+{
+ *rate_min = *rate_max = 0; /* both unlimited */
+ return 0;
+}
+
+static void dump(void *obj, snd_output_t *out)
+{
+ snd_output_printf(out, "Converter: libsamplerate\n");
+}
+#endif
+
static snd_pcm_rate_ops_t pcm_src_ops = {
.close = pcm_src_close,
.init = pcm_src_init,
@@ -146,6 +160,11 @@ static snd_pcm_rate_ops_t pcm_src_ops = {
.convert_s16 = pcm_src_convert_s16,
.input_frames = input_frames,
.output_frames = output_frames,
+#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002
+ .version = SND_PCM_RATE_PLUGIN_VERSION,
+ .get_supported_rates = get_supported_rates,
+ .dump = dump,
+#endif
};
static int pcm_src_open(unsigned int version, void **objp,
@@ -153,18 +172,24 @@ static int pcm_src_open(unsigned int version, void **objp,
{
struct rate_src *rate;
+#if SND_PCM_RATE_PLUGIN_VERSION < 0x010002
if (version != SND_PCM_RATE_PLUGIN_VERSION) {
fprintf(stderr, "Invalid rate plugin version %x\n", version);
return -EINVAL;
}
-
+#endif
rate = calloc(1, sizeof(*rate));
if (! rate)
return -ENOMEM;
rate->converter = type;
*objp = rate;
- *ops = pcm_src_ops;
+#if SND_PCM_RATE_PLUGIN_VERSION >= 0x010002
+ if (version == 0x010001)
+ memcpy(ops, &pcm_src_ops, sizeof(snd_pcm_rate_old_ops_t));
+ else
+#endif
+ *ops = pcm_src_ops;
return 0;
}