From 617c912e950d582c5690e558b28fa1070f9b8263 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Jun 2008 12:17:58 +0000
Subject: 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
---
 src/dso.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/dso.c')

diff --git a/src/dso.c b/src/dso.c
index a302b27..5ff0fec 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -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;
         }
-- 
cgit