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

Ensure enough default sends for EAX with the config option set

Browse Source
This commit is contained in:
Chris Robinson 2022-05-27 15:58:03 -07:00
parent 233863cf29
commit 7518a8a503
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
alc/alc.cpp
View File

@ -3399,6 +3399,13 @@ START_API_FUNC
deviceName = nullptr; deviceName = nullptr;
} }
const uint DefaultSends{
#ifdef ALSOFT_EAX
eax_g_is_enabled ? uint{EAX_MAX_FXSLOTS} :
#endif // ALSOFT_EAX
DEFAULT_SENDS
};
DeviceRef device{new ALCdevice{DeviceType::Playback}}; DeviceRef device{new ALCdevice{DeviceType::Playback}};
/* Set output format */ /* Set output format */
@ -3410,11 +3417,7 @@ START_API_FUNC
device->SourcesMax = 256; device->SourcesMax = 256;
device->AuxiliaryEffectSlotMax = 64; device->AuxiliaryEffectSlotMax = 64;
device->NumAuxSends = DEFAULT_SENDS; device->NumAuxSends = DefaultSends;
#ifdef ALSOFT_EAX
if(eax_g_is_enabled)
device->NumAuxSends = EAX_MAX_FXSLOTS;
#endif // ALSOFT_EAX
try { try {
auto backend = PlaybackFactory->createBackend(device.get(), BackendType::Playback); auto backend = PlaybackFactory->createBackend(device.get(), BackendType::Playback);
@ -3451,8 +3454,10 @@ START_API_FUNC
device->AuxiliaryEffectSlotMax = minu(slotsmax, INT_MAX); device->AuxiliaryEffectSlotMax = minu(slotsmax, INT_MAX);
if(auto sendsopt = device->configValue<int>(nullptr, "sends")) if(auto sendsopt = device->configValue<int>(nullptr, "sends"))
device->NumAuxSends = minu(DEFAULT_SENDS, {
static_cast<uint>(clampi(*sendsopt, 0, MAX_SENDS))); const int max_sends{clampi(*sendsopt, 0, MAX_SENDS)};
device->NumAuxSends = minu(DefaultSends, static_cast<uint>(max_sends));
}
device->NumStereoSources = 1; device->NumStereoSources = 1;
device->NumMonoSources = device->SourcesMax - device->NumStereoSources; device->NumMonoSources = device->SourcesMax - device->NumStereoSources;
@ -3717,11 +3722,18 @@ START_API_FUNC
return nullptr; return nullptr;
} }
const uint DefaultSends{
#ifdef ALSOFT_EAX
eax_g_is_enabled ? uint{EAX_MAX_FXSLOTS} :
#endif // ALSOFT_EAX
DEFAULT_SENDS
};
DeviceRef device{new ALCdevice{DeviceType::Loopback}}; DeviceRef device{new ALCdevice{DeviceType::Loopback}};
device->SourcesMax = 256; device->SourcesMax = 256;
device->AuxiliaryEffectSlotMax = 64; device->AuxiliaryEffectSlotMax = 64;
device->NumAuxSends = DEFAULT_SENDS; device->NumAuxSends = DefaultSends;
//Set output format //Set output format
device->BufferSize = 0; device->BufferSize = 0;
@ -3738,8 +3750,10 @@ START_API_FUNC
device->AuxiliaryEffectSlotMax = minu(slotsmax, INT_MAX); device->AuxiliaryEffectSlotMax = minu(slotsmax, INT_MAX);
if(auto sendsopt = ConfigValueInt(nullptr, nullptr, "sends")) if(auto sendsopt = ConfigValueInt(nullptr, nullptr, "sends"))
device->NumAuxSends = minu(DEFAULT_SENDS, {
static_cast<uint>(clampi(*sendsopt, 0, MAX_SENDS))); const int max_sends{clampi(*sendsopt, 0, MAX_SENDS)};
device->NumAuxSends = minu(DefaultSends, static_cast<uint>(max_sends));
}
device->NumStereoSources = 1; device->NumStereoSources = 1;
device->NumMonoSources = device->SourcesMax - device->NumStereoSources; device->NumMonoSources = device->SourcesMax - device->NumStereoSources;