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

Avoid a couple explicit loops

Browse Source
This commit is contained in:
Chris Robinson 2018-11-22 22:53:22 -08:00
parent 976e49711b
commit 438e626993
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Alc/panning.cpp
View File

@ -219,32 +219,31 @@ static inline const char *GetLabelFromChannel(enum Channel channel)
}
typedef struct ChannelMap {
enum Channel ChanName;
struct ChannelMap {
Channel ChanName;
ChannelConfig Config;
} ChannelMap;
};
static void SetChannelMap(const enum Channel devchans[MAX_OUTPUT_CHANNELS],
static void SetChannelMap(const Channel (&devchans)[MAX_OUTPUT_CHANNELS],
ChannelConfig *ambicoeffs, const ChannelMap *chanmap,
ALsizei count, ALsizei *outcount)
{
ALsizei maxchans = 0;
ALsizei i, j;
for(i = 0;i < count;i++)
ALsizei maxchans{0};
std::for_each(chanmap, chanmap+count,
[&maxchans,&devchans,ambicoeffs](const ChannelMap &channel) -> void
{
ALint idx = GetChannelIndex(devchans, chanmap[i].ChanName);
ALint idx = GetChannelIndex(devchans, channel.ChanName);
if(idx < 0)
{
ERR("Failed to find %s channel in device\n",
GetLabelFromChannel(chanmap[i].ChanName));
continue;
GetLabelFromChannel(channel.ChanName));
return;
}
maxchans = maxi(maxchans, idx+1);
for(j = 0;j < MAX_AMBI_COEFFS;j++)
ambicoeffs[idx][j] = chanmap[i].Config[j];
std::copy_n(channel.Config, MAX_AMBI_COEFFS, ambicoeffs[idx]);
}
);
*outcount = mini(maxchans, MAX_OUTPUT_CHANNELS);
}

13
OpenAL32/Include/alMain.h
View File

@ -20,6 +20,7 @@
#include <vector>
#include <string>
#include <chrono>
#include <algorithm>
#include "AL/al.h"
#include "AL/alc.h"
@ -822,15 +823,11 @@ void SetDefaultWFXChannelOrder(ALCdevice *device);
const ALCchar *DevFmtTypeString(enum DevFmtType type);
const ALCchar *DevFmtChannelsString(enum DevFmtChannels chans);
inline ALint GetChannelIndex(const enum Channel names[MAX_OUTPUT_CHANNELS], enum Channel chan)
inline ALint GetChannelIndex(const enum Channel (&names)[MAX_OUTPUT_CHANNELS], enum Channel chan)
{
ALint i;
for(i = 0;i < MAX_OUTPUT_CHANNELS;i++)
{
if(names[i] == chan)
return i;
}
return -1;
auto iter = std::find(std::begin(names), std::end(names), chan);
if(iter == std::end(names)) return -1;
return std::distance(names, iter);
}
/**
* GetChannelIdxByName