diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-06-06 12:17:58 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-06-06 12:17:58 +0000 |
commit | 617c912e950d582c5690e558b28fa1070f9b8263 (patch) | |
tree | e0c2ef90b6fcd291f3466a2c703d07b208981d06 /src/dso.c | |
parent | 0cc6ddf46d77f0f8c657588b8373e1e87512d578 (diff) |
unify double inclusion defines src/sound-theme-spec.h src/read-wav.h src/read-vorbis.h src/proplist.h src/mutex.h src/llist.h src/common.h
git-svn-id: file:///home/lennart/svn/public/libcanberra/trunk@52 01b60673-d06a-42c0-afdd-89cb8e0f78ac
Diffstat (limited to 'src/dso.c')
-rw-r--r-- | src/dso.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -152,7 +152,6 @@ static int try_open(ca_context *c, const char *t) { int driver_open(ca_context *c) { int ret; struct private_dso *p; - const char *d; ca_return_val_if_fail(c, CA_ERROR_INVALID); ca_return_val_if_fail(!PRIVATE_DSO(c), CA_ERROR_STATE); @@ -168,12 +167,9 @@ int driver_open(ca_context *c) { p->ltdl_initialized = TRUE; - if (!(d = c->driver)) - d = getenv("CANBERRA_DRIVER"); + if (c->driver) { - if (d) { - - if ((ret = try_open(c, d)) < 0) { + if ((ret = try_open(c, c->driver)) < 0) { driver_destroy(c); return ret; } |