kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize a bit of aluInitRenderer code

Browse Source
This commit is contained in:
Chris Robinson 2016-04-16 14:00:22 -07:00
parent 325245f4b8
commit d1f3a15470
1 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Alc/panning.c
View File

@ -269,23 +269,6 @@ DECL_CONST static inline const char *GetLabelFromChannel(enum Channel channel)
} }
DECL_CONST static const char *GetChannelLayoutName(enum DevFmtChannels chans)
{
switch(chans)
{
case DevFmtMono: return "mono";
case DevFmtStereo: return "stereo";
case DevFmtQuad: return "quad";
case DevFmtX51: return "surround51";
case DevFmtX51Rear: return "surround51rear";
case DevFmtX61: return "surround61";
case DevFmtX71: return "surround71";
case DevFmtBFormat3D:
break;
}
return NULL;
}
typedef struct ChannelMap { typedef struct ChannelMap {
enum Channel ChanName; enum Channel ChanName;
ChannelConfig Config; ChannelConfig Config;
@ -772,11 +755,9 @@ static void InitUhjPanning(ALCdevice *device)
void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf_appreq, enum HrtfRequestMode hrtf_userreq) void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf_appreq, enum HrtfRequestMode hrtf_userreq)
{ {
ALCenum hrtf_status;
const char *mode; const char *mode;
bool headphones; bool headphones;
int bs2blevel; int bs2blevel;
int usehrtf;
size_t i; size_t i;
device->Hrtf = NULL; device->Hrtf = NULL;
@ -790,19 +771,28 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
if(device->FmtChans != DevFmtStereo) if(device->FmtChans != DevFmtStereo)
{ {
ALuint speakermap[MAX_OUTPUT_CHANNELS]; ALuint speakermap[MAX_OUTPUT_CHANNELS];
const char *devname, *layout; const char *devname, *layout = NULL;
AmbDecConf conf, *pconf; AmbDecConf conf, *pconf = NULL;
if(hrtf_appreq == Hrtf_Enable) if(hrtf_appreq == Hrtf_Enable)
device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT; device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
pconf = NULL;
ambdec_init(&conf); ambdec_init(&conf);
devname = al_string_get_cstr(device->DeviceName); devname = al_string_get_cstr(device->DeviceName);
layout = NULL; switch(device->FmtChans)
if(device->FmtChans != DevFmtMono) {
layout = GetChannelLayoutName(device->FmtChans); case DevFmtQuad: layout = "quad"; break;
case DevFmtX51: layout = "surround51"; break;
case DevFmtX51Rear: layout = "surround51rear"; break;
case DevFmtX61: layout = "surround61"; break;
case DevFmtX71: layout = "surround71"; break;
/* Mono, Stereo, and B-Fornat output don't use custom decoders. */
case DevFmtMono:
case DevFmtStereo:
case DevFmtBFormat3D:
break;
}
if(layout) if(layout)
{ {
const char *fname; const char *fname;
@ -855,9 +845,7 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
bformatdec_free(device->AmbiDecoder); bformatdec_free(device->AmbiDecoder);
device->AmbiDecoder = NULL; device->AmbiDecoder = NULL;
hrtf_status = device->Hrtf_Status;
headphones = device->IsHeadphones; headphones = device->IsHeadphones;
if(device->Type != Loopback) if(device->Type != Loopback)
{ {
const char *mode; const char *mode;
@ -874,29 +862,25 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
if(hrtf_userreq == Hrtf_Default) if(hrtf_userreq == Hrtf_Default)
{ {
usehrtf = (headphones && hrtf_appreq != Hrtf_Disable) || bool usehrtf = (headphones && hrtf_appreq != Hrtf_Disable) ||
(hrtf_appreq == Hrtf_Enable); (hrtf_appreq == Hrtf_Enable);
if(!usehrtf) goto no_hrtf;
device->Hrtf_Status = ALC_HRTF_ENABLED_SOFT;
if(headphones && hrtf_appreq != Hrtf_Disable) if(headphones && hrtf_appreq != Hrtf_Disable)
hrtf_status = ALC_HRTF_HEADPHONES_DETECTED_SOFT; device->Hrtf_Status = ALC_HRTF_HEADPHONES_DETECTED_SOFT;
else if(usehrtf)
hrtf_status = ALC_HRTF_ENABLED_SOFT;
} }
else else
{ {
usehrtf = (hrtf_userreq == Hrtf_Enable); if(hrtf_userreq != Hrtf_Enable)
if(!usehrtf) {
hrtf_status = ALC_HRTF_DENIED_SOFT; if(hrtf_appreq == Hrtf_Enable)
else device->Hrtf_Status = ALC_HRTF_DENIED_SOFT;
hrtf_status = ALC_HRTF_REQUIRED_SOFT; goto no_hrtf;
}
device->Hrtf_Status = ALC_HRTF_REQUIRED_SOFT;
} }
if(!usehrtf)
{
device->Hrtf_Status = hrtf_status;
goto no_hrtf;
}
device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
if(VECTOR_SIZE(device->Hrtf_List) == 0) if(VECTOR_SIZE(device->Hrtf_List) == 0)
{ {
VECTOR_DEINIT(device->Hrtf_List); VECTOR_DEINIT(device->Hrtf_List);
@ -925,8 +909,7 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
if(device->Hrtf) if(device->Hrtf)
{ {
device->Hrtf_Status = hrtf_status; device->Render_Mode = HrtfRender;
device->Render_Mode = NormalRender;
if(ConfigValueStr(al_string_get_cstr(device->DeviceName), NULL, "hrtf-mode", &mode)) if(ConfigValueStr(al_string_get_cstr(device->DeviceName), NULL, "hrtf-mode", &mode))
{ {
if(strcasecmp(mode, "full") == 0) if(strcasecmp(mode, "full") == 0)
@ -941,6 +924,7 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
InitHrtfPanning(device); InitHrtfPanning(device);
return; return;
} }
device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT;
no_hrtf: no_hrtf:
TRACE("HRTF disabled\n"); TRACE("HRTF disabled\n");