diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2008-08-27 22:35:55 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-08-27 23:42:57 +0200 |
| commit | 71d4aa894d97604077102839453b76a8798e7db3 (patch) | |
| tree | e9ebeae57bdb03213fbacaca7a02f52d35514427 /src/multi.c | |
| parent | bcd508a4e525b6512da639f432920fc44b811432 (diff) | |
multi: accept CANBERRA_DRIVER=multi, pulse
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Lennart Poettering <lennart@poettering.net>
Diffstat (limited to 'src/multi.c')
| -rw-r--r-- | src/multi.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |