aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/backends/alsa.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-03-22 00:28:55 -0700
committerChris Robinson <[email protected]>2014-03-22 00:28:55 -0700
commitd8bfd12d313372830f0e0b34fafcaa244395cf3c (patch)
tree14f4a3fe6e30380d5aded77969c59bf74fc8ca94 /Alc/backends/alsa.c
parent0a030c2bd91a0f7c94ce310ea4b03c6a923463b9 (diff)
Use a void* for the backend Delete method param
Diffstat (limited to 'Alc/backends/alsa.c')
-rw-r--r--Alc/backends/alsa.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/Alc/backends/alsa.c b/Alc/backends/alsa.c
index 874b31c3..51965cec 100644
--- a/Alc/backends/alsa.c
+++ b/Alc/backends/alsa.c
@@ -408,6 +408,7 @@ static DECLARE_FORWARD2(ALCplaybackAlsa, ALCbackend, ALCenum, captureSamples, vo
static DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, ALCuint, availableSamples)
static DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, void, lock)
static DECLARE_FORWARD(ALCplaybackAlsa, ALCbackend, void, unlock)
+DECLARE_DEFAULT_ALLOCATORS(ALCplaybackAlsa)
static void ALCplaybackAlsa_Construct(ALCplaybackAlsa *self, ALCdevice *device)
@@ -888,12 +889,6 @@ static ALint64 ALCplaybackAlsa_getLatency(ALCplaybackAlsa *self)
return maxi64((ALint64)delay*1000000000/device->Frequency, 0);
}
-
-static void ALCplaybackAlsa_Delete(ALCplaybackAlsa *self)
-{
- free(self);
-}
-
DEFINE_ALCBACKEND_VTABLE(ALCplaybackAlsa);
@@ -923,6 +918,7 @@ static ALCenum ALCcaptureAlsa_captureSamples(ALCcaptureAlsa *self, ALCvoid *buff
static ALCuint ALCcaptureAlsa_availableSamples(ALCcaptureAlsa *self);
static DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, void, lock)
static DECLARE_FORWARD(ALCcaptureAlsa, ALCbackend, void, unlock)
+DECLARE_DEFAULT_ALLOCATORS(ALCcaptureAlsa)
static void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device)
@@ -1287,11 +1283,6 @@ static ALint64 ALCcaptureAlsa_getLatency(ALCcaptureAlsa *self)
return maxi64((ALint64)delay*1000000000/device->Frequency, 0);
}
-static void ALCcaptureAlsa_Delete(ALCcaptureAlsa *self)
-{
- free(self);
-}
-
DEFINE_ALCBACKEND_VTABLE(ALCcaptureAlsa);
@@ -1386,8 +1377,9 @@ static ALCbackend* ALCalsaBackendFactory_createBackend(ALCalsaBackendFactory* UN
{
ALCplaybackAlsa *backend;
- backend = calloc(1, sizeof(*backend));
+ backend = ALCplaybackAlsa_New(sizeof(*backend));
if(!backend) return NULL;
+ memset(backend, 0, sizeof(*backend));
ALCplaybackAlsa_Construct(backend, device);
@@ -1397,8 +1389,9 @@ static ALCbackend* ALCalsaBackendFactory_createBackend(ALCalsaBackendFactory* UN
{
ALCcaptureAlsa *backend;
- backend = calloc(1, sizeof(*backend));
+ backend = ALCcaptureAlsa_New(sizeof(*backend));
if(!backend) return NULL;
+ memset(backend, 0, sizeof(*backend));
ALCcaptureAlsa_Construct(backend, device);