AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix capture with the new backend interface

Browse Source
This commit is contained in:
Chris Robinson 2013-10-28 22:03:54 -07:00
parent 16d5d5760c
commit 3c65c946d4
4 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Alc/ALc.c
View File

@ -2890,7 +2890,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
else
{
ALCbackendFactory *factory = PlaybackBackend.getFactory();
device->Backend = VCALL(factory,createBackend)(device);
device->Backend = VCALL(factory,createBackend)(device, ALCbackend_Playback);
}
if(!device->Backend)
{
@ -3152,7 +3152,13 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
device->DeviceName = NULL;
device->Backend = create_backend_wrapper(device, ALCbackend_Capture);
if(!CaptureBackend.getFactory)
device->Backend = create_backend_wrapper(device, ALCbackend_Capture);
else
{
ALCbackendFactory *factory = CaptureBackend.getFactory();
device->Backend = VCALL(factory,createBackend)(device, ALCbackend_Capture);
}
if(!device->Backend)
{
al_free(device);

31
Alc/backends/alsa.c
View File

@ -1466,17 +1466,34 @@ void ALCalsaBackendFactory_probe(ALCalsaBackendFactory* UNUSED(self), enum DevPr
}
}
ALCbackend* ALCalsaBackendFactory_createBackend(ALCalsaBackendFactory* UNUSED(self), ALCdevice *device)
ALCbackend* ALCalsaBackendFactory_createBackend(ALCalsaBackendFactory* UNUSED(self), ALCdevice *device, ALCbackend_Type type)
{
ALCplaybackAlsa *backend;
if(type == ALCbackend_Playback)
{
ALCplaybackAlsa *backend;
backend = calloc(1, sizeof(*backend));
if(!backend) return NULL;
SET_VTABLE2(ALCplaybackAlsa, ALCbackend, backend);
backend = calloc(1, sizeof(*backend));
if(!backend) return NULL;
SET_VTABLE2(ALCplaybackAlsa, ALCbackend, backend);
ALCplaybackAlsa_Construct(backend, device);
ALCplaybackAlsa_Construct(backend, device);
return STATIC_CAST(ALCbackend, backend);
return STATIC_CAST(ALCbackend, backend);
}
if(type == ALCbackend_Capture)
{
ALCcaptureAlsa *backend;
backend = calloc(1, sizeof(*backend));
if(!backend) return NULL;
SET_VTABLE2(ALCcaptureAlsa, ALCbackend, backend);
ALCcaptureAlsa_Construct(backend, device);
return STATIC_CAST(ALCbackend, backend);
}
return NULL;
}
DEFINE_ALCBACKENDFACTORY_VTABLE(ALCalsaBackendFactory);

6
Alc/backends/base.h
View File

@ -106,7 +106,7 @@ struct ALCbackendFactoryVtable {
void (*const probe)(ALCbackendFactory *self, enum DevProbe type);
ALCbackend* (*const createBackend)(ALCbackendFactory *self, ALCdevice *device);
ALCbackend* (*const createBackend)(ALCbackendFactory *self, ALCdevice *device, ALCbackend_Type type);
};
#define DEFINE_ALCBACKENDFACTORY_VTABLE(T) \
@ -118,8 +118,8 @@ static ALCboolean T##_ALCbackendFactory_querySupport(ALCbackendFactory *obj, ALC
{ return T##_querySupport(STATIC_UPCAST(T, ALCbackendFactory, obj), a); } \
static void T##_ALCbackendFactory_probe(ALCbackendFactory *obj, enum DevProbe a) \
{ T##_probe(STATIC_UPCAST(T, ALCbackendFactory, obj), a); } \
static ALCbackend* T##_ALCbackendFactory_createBackend(ALCbackendFactory *obj, ALCdevice *a) \
{ return T##_createBackend(STATIC_UPCAST(T, ALCbackendFactory, obj), a); } \
static ALCbackend* T##_ALCbackendFactory_createBackend(ALCbackendFactory *obj, ALCdevice *a, ALCbackend_Type b) \
{ return T##_createBackend(STATIC_UPCAST(T, ALCbackendFactory, obj), a, b); } \
\
static const struct ALCbackendFactoryVtable T##_ALCbackendFactory_vtable = { \
T##_ALCbackendFactory_init, \

4
Alc/backends/null.c
View File

@ -206,10 +206,12 @@ void ALCnullBackendFactory_probe(ALCnullBackendFactory* UNUSED(self), enum DevPr
}
}
ALCbackend* ALCnullBackendFactory_createBackend(ALCnullBackendFactory* UNUSED(self), ALCdevice *device)
ALCbackend* ALCnullBackendFactory_createBackend(ALCnullBackendFactory* UNUSED(self), ALCdevice *device, ALCbackend_Type type)
{
ALCnullBackend *backend;
assert(type == ALCbackend_Playback);
backend = calloc(1, sizeof(*backend));
if(!backend) return NULL;
SET_VTABLE2(ALCnullBackend, ALCbackend, backend);