#include <pulsecore/hashmap.h>
#include <pulsecore/idxset.h>
-#include <pulsecore/sample-util.h>
-#include <pulsecore/namereg.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/source.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
#include "modargs.h"
+struct pa_modargs {
+ pa_hashmap *raw;
+ pa_hashmap *unescaped;
+};
+
struct entry {
char *key, *value;
};
-static int add_key_value(pa_hashmap *map, char *key, char *value, const char* const valid_keys[]) {
+static int add_key_value(pa_modargs *ma, char *key, char *value, const char* const valid_keys[]) {
struct entry *e;
+ char *raw;
- pa_assert(map);
+ pa_assert(ma);
+ pa_assert(ma->raw);
+ pa_assert(ma->unescaped);
pa_assert(key);
pa_assert(value);
- if (pa_hashmap_get(map, key)) {
+ if (pa_hashmap_get(ma->unescaped, key)) {
pa_xfree(key);
pa_xfree(value);
return -1;
if (valid_keys) {
const char*const* v;
for (v = valid_keys; *v; v++)
- if (strcmp(*v, key) == 0)
+ if (pa_streq(*v, key))
break;
if (!*v) {
}
}
+ raw = pa_xstrdup(value);
+
e = pa_xnew(struct entry, 1);
e->key = key;
- e->value = value;
- pa_hashmap_put(map, key, e);
+ e->value = pa_unescape(value);
+ pa_hashmap_put(ma->unescaped, key, e);
+
+ if (pa_streq(raw, value))
+ pa_xfree(raw);
+ else {
+ e = pa_xnew(struct entry, 1);
+ e->key = pa_xstrdup(key);
+ e->value = raw;
+ pa_hashmap_put(ma->raw, key, e);
+ }
return 0;
}
+static void free_func(void *p) {
+ struct entry *e = p;
+ pa_assert(e);
+
+ pa_xfree(e->key);
+ pa_xfree(e->value);
+ pa_xfree(e);
+}
+
pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
enum {
WHITESPACE,
const char *p, *key = NULL, *value = NULL;
size_t key_len = 0, value_len = 0;
- pa_hashmap *map;
+ pa_modargs *ma = pa_xnew(pa_modargs, 1);
- map = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+ ma->raw = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, free_func);
+ ma->unescaped = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, free_func);
if (!args)
- return (pa_modargs*) map;
+ return ma;
state = WHITESPACE;
key_len++;
break;
- case VALUE_START:
+ case VALUE_START:
if (*p == '\'') {
state = VALUE_TICKS;
value = p+1;
value = p+1;
value_len = 0;
} else if (isspace(*p)) {
- if (add_key_value(map,
+ if (add_key_value(ma,
pa_xstrndup(key, key_len),
pa_xstrdup(""),
valid_keys) < 0)
case VALUE_SIMPLE:
if (isspace(*p)) {
- if (add_key_value(map,
+ if (add_key_value(ma,
pa_xstrndup(key, key_len),
- pa_unescape(pa_xstrndup(value, value_len)),
+ pa_xstrndup(value, value_len),
valid_keys) < 0)
goto fail;
state = WHITESPACE;
case VALUE_DOUBLE_QUOTES:
if (*p == '"') {
- if (add_key_value(map,
+ if (add_key_value(ma,
pa_xstrndup(key, key_len),
- pa_unescape(pa_xstrndup(value, value_len)),
+ pa_xstrndup(value, value_len),
valid_keys) < 0)
goto fail;
state = WHITESPACE;
case VALUE_TICKS:
if (*p == '\'') {
- if (add_key_value(map,
+ if (add_key_value(ma,
pa_xstrndup(key, key_len),
- pa_unescape(pa_xstrndup(value, value_len)),
+ pa_xstrndup(value, value_len),
valid_keys) < 0)
goto fail;
state = WHITESPACE;
}
if (state == VALUE_START) {
- if (add_key_value(map, pa_xstrndup(key, key_len), pa_xstrdup(""), valid_keys) < 0)
+ if (add_key_value(ma, pa_xstrndup(key, key_len), pa_xstrdup(""), valid_keys) < 0)
goto fail;
} else if (state == VALUE_SIMPLE) {
- if (add_key_value(map, pa_xstrndup(key, key_len), pa_xstrdup(value), valid_keys) < 0)
+ if (add_key_value(ma, pa_xstrndup(key, key_len), pa_xstrdup(value), valid_keys) < 0)
goto fail;
} else if (state != WHITESPACE)
goto fail;
- return (pa_modargs*) map;
+ return ma;
fail:
- pa_modargs_free((pa_modargs*) map);
+ pa_modargs_free(ma);
return NULL;
}
-static void free_func(void *p, void*userdata) {
- struct entry *e = p;
- pa_assert(e);
-
- pa_xfree(e->key);
- pa_xfree(e->value);
- pa_xfree(e);
-}
-
void pa_modargs_free(pa_modargs*ma) {
- pa_hashmap *map = (pa_hashmap*) ma;
- pa_hashmap_free(map, free_func, NULL);
+ pa_assert(ma);
+
+ pa_hashmap_free(ma->raw);
+ pa_hashmap_free(ma->unescaped);
+ pa_xfree(ma);
}
const char *pa_modargs_get_value(pa_modargs *ma, const char *key, const char *def) {
- pa_hashmap *map = (pa_hashmap*) ma;
struct entry*e;
- if (!(e = pa_hashmap_get(map, key)))
+ pa_assert(ma);
+ pa_assert(key);
+
+ if (!(e = pa_hashmap_get(ma->unescaped, key)))
return def;
return e->value;
}
-int pa_modargs_get_value_u32(pa_modargs *ma, const char *key, uint32_t *value) {
- const char *v;
+static const char *modargs_get_value_raw(pa_modargs *ma, const char *key, const char *def) {
+ struct entry*e;
pa_assert(ma);
pa_assert(key);
+
+ if (!(e = pa_hashmap_get(ma->raw, key)))
+ if (!(e = pa_hashmap_get(ma->unescaped, key)))
+ return def;
+
+ return e->value;
+}
+
+int pa_modargs_get_value_u32(pa_modargs *ma, const char *key, uint32_t *value) {
+ const char *v;
+
pa_assert(value);
if (!(v = pa_modargs_get_value(ma, key, NULL)))
int pa_modargs_get_value_s32(pa_modargs *ma, const char *key, int32_t *value) {
const char *v;
- pa_assert(ma);
- pa_assert(key);
pa_assert(value);
if (!(v = pa_modargs_get_value(ma, key, NULL)))
return 0;
}
-int pa_modargs_get_value_boolean(pa_modargs *ma, const char *key, pa_bool_t *value) {
+int pa_modargs_get_value_boolean(pa_modargs *ma, const char *key, bool *value) {
const char *v;
int r;
- pa_assert(ma);
- pa_assert(key);
pa_assert(value);
if (!(v = pa_modargs_get_value(ma, key, NULL)))
return 0;
}
+int pa_modargs_get_value_double(pa_modargs *ma, const char *key, double *value) {
+ const char *v;
+
+ pa_assert(value);
+
+ if (!(v = pa_modargs_get_value(ma, key, NULL)))
+ return 0;
+
+ if (pa_atod(v, value) < 0)
+ return -1;
+
+ return 0;
+}
+
+int pa_modargs_get_value_volume(pa_modargs *ma, const char *key, pa_volume_t *value) {
+ const char *v;
+
+ pa_assert(value);
+
+ if (!(v = pa_modargs_get_value(ma, key, NULL)))
+ return 0;
+
+ if (pa_parse_volume(v, value) < 0)
+ return -1;
+
+ return 0;
+}
+
+int pa_modargs_get_sample_rate(pa_modargs *ma, uint32_t *rate) {
+ uint32_t rate_local;
+
+ pa_assert(rate);
+
+ rate_local = *rate;
+ if ((pa_modargs_get_value_u32(ma, "rate", &rate_local)) < 0 ||
+ !pa_sample_rate_valid(rate_local))
+ return -1;
+
+ *rate = rate_local;
+
+ return 0;
+}
+
int pa_modargs_get_sample_spec(pa_modargs *ma, pa_sample_spec *rss) {
const char *format;
uint32_t channels;
pa_sample_spec ss;
- pa_assert(ma);
pa_assert(rss);
ss = *rss;
- if ((pa_modargs_get_value_u32(ma, "rate", &ss.rate)) < 0 ||
- ss.rate <= 0 ||
- ss.rate > PA_RATE_MAX)
+ if ((pa_modargs_get_sample_rate(ma, &ss.rate)) < 0)
return -1;
channels = ss.channels;
if ((pa_modargs_get_value_u32(ma, "channels", &channels)) < 0 ||
- channels <= 0 ||
- channels >= PA_CHANNELS_MAX)
+ !pa_channels_valid(channels))
return -1;
ss.channels = (uint8_t) channels;
return 0;
}
+int pa_modargs_get_alternate_sample_rate(pa_modargs *ma, uint32_t *alternate_rate) {
+ uint32_t rate_local;
+
+ pa_assert(alternate_rate);
+
+ rate_local = *alternate_rate;
+ if ((pa_modargs_get_value_u32(ma, "alternate_rate", &rate_local)) < 0 ||
+ !pa_sample_rate_valid(*alternate_rate))
+ return -1;
+
+ if (!((rate_local % 4000 == 0) || (rate_local % 11025 == 0)))
+ return -1;
+
+ *alternate_rate = rate_local;
+
+ return 0;
+}
+
int pa_modargs_get_channel_map(pa_modargs *ma, const char *name, pa_channel_map *rmap) {
pa_channel_map map;
const char *cm;
- pa_assert(ma);
pa_assert(rmap);
map = *rmap;
return 0;
}
+int pa_modargs_get_resample_method(pa_modargs *ma, pa_resample_method_t *rmethod) {
+ const char *m;
+
+ pa_assert(ma);
+ pa_assert(rmethod);
+
+ if ((m = pa_modargs_get_value(ma, "resample_method", NULL))) {
+ pa_resample_method_t method = pa_parse_resample_method(m);
+
+ if (method == PA_RESAMPLER_INVALID)
+ return -1;
+
+ *rmethod = method;
+ }
+
+ return 0;
+}
+
int pa_modargs_get_sample_spec_and_channel_map(
pa_modargs *ma,
pa_sample_spec *rss,
pa_sample_spec ss;
pa_channel_map map;
- pa_assert(ma);
pa_assert(rss);
pa_assert(rmap);
if (pa_modargs_get_channel_map(ma, NULL, &map) < 0)
return -1;
- if (map.channels != ss.channels)
- return -1;
+ if (map.channels != ss.channels) {
+ if (!pa_modargs_get_value(ma, "channels", NULL))
+ ss.channels = map.channels;
+ else
+ return -1;
+ }
*rmap = map;
*rss = ss;
pa_assert(name);
pa_assert(p);
- if (!(v = pa_modargs_get_value(ma, name, NULL)))
+ if (!(v = modargs_get_value_raw(ma, name, NULL)))
return 0;
if (!(n = pa_proplist_from_string(v)))
}
const char *pa_modargs_iterate(pa_modargs *ma, void **state) {
- pa_hashmap *map = (pa_hashmap*) ma;
struct entry *e;
- if (!(e = pa_hashmap_iterate(map, state, NULL)))
+ pa_assert(ma);
+
+ if (!(e = pa_hashmap_iterate(ma->unescaped, state, NULL)))
return NULL;
return e->key;