From 71d4aa894d97604077102839453b76a8798e7db3 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Wed, 27 Aug 2008 22:35:55 +0300 Subject: multi: accept CANBERRA_DRIVER=multi, pulse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau Signed-off-by: Lennart Poettering --- src/multi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/multi.c') diff --git a/src/multi.c b/src/multi.c index 0215296..298df7d 100644 --- a/src/multi.c +++ b/src/multi.c @@ -105,7 +105,8 @@ int driver_open(ca_context *c) { int ret = CA_SUCCESS; ca_return_val_if_fail(c, CA_ERROR_INVALID); - ca_return_val_if_fail(!c->driver || ca_streq(c->driver, "multi"), CA_ERROR_NODRIVER); + ca_return_val_if_fail(c->driver, CA_ERROR_NODRIVER); + ca_return_val_if_fail(!strncmp(c->driver, "multi", 5), CA_ERROR_NODRIVER); ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE); if (!(c->private = p = ca_new0(struct private, 1))) @@ -126,7 +127,7 @@ int driver_open(ca_context *c) { size_t n; ca_bool_t last; - n = strcspn(k, ":"); + n = strcspn(k, ",:"); last = k[n] == 0; k[n] = 0; -- cgit