mirror of
https://github.com/love2d/megasource.git
synced 2026-08-18 03:34:25 +02:00
Update OpenAL-soft to 1.23.1-bc7cb17.
This commit is contained in:
@@ -3,9 +3,12 @@
|
||||
|
||||
#include "device.h"
|
||||
|
||||
#include <cstddef>
|
||||
#include <numeric>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "al/buffer.h"
|
||||
#include "al/effect.h"
|
||||
#include "al/filter.h"
|
||||
#include "albit.h"
|
||||
#include "alconfig.h"
|
||||
#include "backends/base.h"
|
||||
@@ -34,19 +37,19 @@ ALCdevice::~ALCdevice()
|
||||
|
||||
Backend = nullptr;
|
||||
|
||||
size_t count{std::accumulate(BufferList.cbegin(), BufferList.cend(), size_t{0u},
|
||||
size_t count{std::accumulate(BufferList.cbegin(), BufferList.cend(), 0_uz,
|
||||
[](size_t cur, const BufferSubList &sublist) noexcept -> size_t
|
||||
{ return cur + static_cast<uint>(al::popcount(~sublist.FreeMask)); })};
|
||||
if(count > 0)
|
||||
WARN("%zu Buffer%s not deleted\n", count, (count==1)?"":"s");
|
||||
|
||||
count = std::accumulate(EffectList.cbegin(), EffectList.cend(), size_t{0u},
|
||||
count = std::accumulate(EffectList.cbegin(), EffectList.cend(), 0_uz,
|
||||
[](size_t cur, const EffectSubList &sublist) noexcept -> size_t
|
||||
{ return cur + static_cast<uint>(al::popcount(~sublist.FreeMask)); });
|
||||
if(count > 0)
|
||||
WARN("%zu Effect%s not deleted\n", count, (count==1)?"":"s");
|
||||
|
||||
count = std::accumulate(FilterList.cbegin(), FilterList.cend(), size_t{0u},
|
||||
count = std::accumulate(FilterList.cbegin(), FilterList.cend(), 0_uz,
|
||||
[](size_t cur, const FilterSubList &sublist) noexcept -> size_t
|
||||
{ return cur + static_cast<uint>(al::popcount(~sublist.FreeMask)); });
|
||||
if(count > 0)
|
||||
@@ -55,8 +58,8 @@ ALCdevice::~ALCdevice()
|
||||
|
||||
void ALCdevice::enumerateHrtfs()
|
||||
{
|
||||
mHrtfList = EnumerateHrtf(configValue<std::string>(nullptr, "hrtf-paths"));
|
||||
if(auto defhrtfopt = configValue<std::string>(nullptr, "default-hrtf"))
|
||||
mHrtfList = EnumerateHrtf(configValue<std::string>({}, "hrtf-paths"));
|
||||
if(auto defhrtfopt = configValue<std::string>({}, "default-hrtf"))
|
||||
{
|
||||
auto iter = std::find(mHrtfList.begin(), mHrtfList.end(), *defhrtfopt);
|
||||
if(iter == mHrtfList.end())
|
||||
@@ -84,7 +87,10 @@ auto ALCdevice::getOutputMode1() const noexcept -> OutputMode1
|
||||
case DevFmtX51: return OutputMode1::X51;
|
||||
case DevFmtX61: return OutputMode1::X61;
|
||||
case DevFmtX71: return OutputMode1::X71;
|
||||
case DevFmtAmbi3D: break;
|
||||
case DevFmtX714:
|
||||
case DevFmtX3D71:
|
||||
case DevFmtAmbi3D:
|
||||
break;
|
||||
}
|
||||
return OutputMode1::Any;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user