From 0ec4a7c40d36b9c25f3d2e3f82e2323c98077e55 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Wed, 25 Jun 2008 00:28:53 +0300 Subject: Replace streq with ca_streq 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/dso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dso.c') diff --git a/src/dso.c b/src/dso.c index 31db543..02eb672 100644 --- a/src/dso.c +++ b/src/dso.c @@ -106,7 +106,7 @@ static int lt_error_from_string(const char *t) { const struct lt_error_code *c; for (c = lt_error_codes; c->text; c++) - if (streq(t, c->text)) + if (ca_streq(t, c->text)) return c->code; return -1; -- cgit From da2c352f04de5b9c4f071a0f0ad57cb2cdd51eff Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 25 Jun 2008 01:33:14 +0200 Subject: export the driver_order as ca_driver_order --- src/dso.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/dso.c') diff --git a/src/dso.c b/src/dso.c index 02eb672..aacec71 100644 --- a/src/dso.c +++ b/src/dso.c @@ -29,6 +29,7 @@ #include "driver.h" #include "common.h" #include "malloc.h" +#include "driver-order.h" struct private_dso { lt_dlhandle module; @@ -45,17 +46,6 @@ struct private_dso { #define PRIVATE_DSO(c) ((struct private_dso *) ((c)->private_dso)) -static const char* const driver_order[] = { -#ifdef HAVE_PULSE - "pulse", -#endif -#ifdef HAVE_ALSA - "alsa", -#endif - /* ... */ - NULL -}; - static int ca_error_from_lt_error(int code) { static const int table[] = { @@ -214,7 +204,7 @@ int driver_open(ca_context *c) { } else { const char *const * e; - for (e = driver_order; *e; e++) { + for (e = ca_driver_order; *e; e++) { if ((ret = try_open(c, *e)) == CA_SUCCESS) break; -- cgit