aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-04-23 02:18:07 -0700
committerChris Robinson <[email protected]>2014-04-23 02:18:07 -0700
commit420599f8e37c8657fd1568aca3bcd5d1d4711234 (patch)
tree19207f0301003ec34bdba8caa6d6a6c93ebf48c2
parent7fed6383c017166e0db48b81b3eac1e996e96180 (diff)
Avoid using assert() in createBackend
-rw-r--r--Alc/backends/loopback.c17
-rw-r--r--Alc/backends/null.c17
2 files changed, 20 insertions, 14 deletions
diff --git a/Alc/backends/loopback.c b/Alc/backends/loopback.c
index d509313a..505dfacf 100644
--- a/Alc/backends/loopback.c
+++ b/Alc/backends/loopback.c
@@ -121,15 +121,18 @@ static void ALCloopbackFactory_probe(ALCloopbackFactory* UNUSED(self), enum DevP
static ALCbackend* ALCloopbackFactory_createBackend(ALCloopbackFactory* UNUSED(self), ALCdevice *device, ALCbackend_Type type)
{
- ALCloopback *backend;
+ if(type == ALCbackend_Loopback)
+ {
+ ALCloopback *backend;
- assert(type == ALCbackend_Loopback);
+ backend = ALCloopback_New(sizeof(*backend));
+ if(!backend) return NULL;
+ memset(backend, 0, sizeof(*backend));
- backend = ALCloopback_New(sizeof(*backend));
- if(!backend) return NULL;
- memset(backend, 0, sizeof(*backend));
+ ALCloopback_Construct(backend, device);
- ALCloopback_Construct(backend, device);
+ return STATIC_CAST(ALCbackend, backend);
+ }
- return STATIC_CAST(ALCbackend, backend);
+ return NULL;
}
diff --git a/Alc/backends/null.c b/Alc/backends/null.c
index 2c13a80f..c5a4c15f 100644
--- a/Alc/backends/null.c
+++ b/Alc/backends/null.c
@@ -212,15 +212,18 @@ static void ALCnullBackendFactory_probe(ALCnullBackendFactory* UNUSED(self), enu
static ALCbackend* ALCnullBackendFactory_createBackend(ALCnullBackendFactory* UNUSED(self), ALCdevice *device, ALCbackend_Type type)
{
- ALCnullBackend *backend;
+ if(type == ALCbackend_Playback)
+ {
+ ALCnullBackend *backend;
- assert(type == ALCbackend_Playback);
+ backend = ALCnullBackend_New(sizeof(*backend));
+ if(!backend) return NULL;
+ memset(backend, 0, sizeof(*backend));
- backend = ALCnullBackend_New(sizeof(*backend));
- if(!backend) return NULL;
- memset(backend, 0, sizeof(*backend));
+ ALCnullBackend_Construct(backend, device);
- ALCnullBackend_Construct(backend, device);
+ return STATIC_CAST(ALCbackend, backend);
+ }
- return STATIC_CAST(ALCbackend, backend);
+ return NULL;
}