summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/namereg.h
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-08-30 20:07:31 +0300
commit0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2 (patch)
tree42c290cd1f1c05c687d8134e40b63244d4fba4e9 /src/pulsecore/namereg.h
parent0e096632c53b746b9f4b4c0249d9e5a18c1c543d (diff)
parent8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/modules/module-stream-restore.c
Diffstat (limited to 'src/pulsecore/namereg.h')
-rw-r--r--src/pulsecore/namereg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pulsecore/namereg.h b/src/pulsecore/namereg.h
index 38fae6f5..b5a976d7 100644
--- a/src/pulsecore/namereg.h
+++ b/src/pulsecore/namereg.h
@@ -45,6 +45,7 @@ pa_sink *pa_namereg_get_default_sink(pa_core *c);
pa_source *pa_namereg_get_default_source(pa_core *c);
pa_bool_t pa_namereg_is_valid_name(const char *name);
+pa_bool_t pa_namereg_is_valid_name_or_wildcard(const char *name, pa_namereg_type_t type);
char* pa_namereg_make_valid_name(const char *name);
#endif