summaryrefslogtreecommitdiffstats
path: root/src/dso.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/dso.c')
-rw-r--r--src/dso.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/dso.c b/src/dso.c
index 31db543..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[] = {
@@ -106,7 +96,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;
@@ -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;