ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Swapped C-style arrays to std::array 

Also changed C-Style casts to static_cast
This commit is contained in:
LAGonauta 2017-06-16 18:54:38 -03:00 committed by lfsafady
parent 9eb209c214
commit db7bb3bda8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/AudioCommon/OpenALStream.cpp
View File

@ -296,8 +296,8 @@ void OpenALStream::SoundLoop()
// Remove the Buffer from the Queue. // Remove the Buffer from the Queue.
if (num_buffers_processed) if (num_buffers_processed)
{ {
ALuint unqueued_buffer_ids[OAL_BUFFERS]; std::array<ALuint, OAL_BUFFERS> unqueued_buffer_ids;
palSourceUnqueueBuffers(m_source, num_buffers_processed, unqueued_buffer_ids); palSourceUnqueueBuffers(m_source, num_buffers_processed, unqueued_buffer_ids.data());
err = CheckALError("unqueuing buffers"); err = CheckALError("unqueuing buffers");
num_buffers_queued -= num_buffers_processed; num_buffers_queued -= num_buffers_processed;
@ -307,8 +307,8 @@ void OpenALStream::SoundLoop()
if (use_surround) if (use_surround)
{ {
float dpl2[OAL_MAX_FRAMES * SURROUND_CHANNELS]; std::array<float, OAL_MAX_FRAMES * SURROUND_CHANNELS> dpl2;
u32 rendered_frames = m_mixer->MixSurround(dpl2, min_frames); u32 rendered_frames = m_mixer->MixSurround(dpl2.data(), min_frames);
if (rendered_frames < min_frames) if (rendered_frames < min_frames)
continue; continue;
@ -324,12 +324,12 @@ void OpenALStream::SoundLoop()
if (float32_capable) if (float32_capable)
{ {
palBufferData(m_buffers[next_buffer], AL_FORMAT_51CHN32, dpl2, palBufferData(m_buffers[next_buffer], AL_FORMAT_51CHN32, dpl2.data(),
rendered_frames * FRAME_SURROUND_FLOAT, frequency); rendered_frames * FRAME_SURROUND_FLOAT, frequency);
} }
else if (fixed32_capable) else if (fixed32_capable)
{ {
int surround_int32[OAL_MAX_FRAMES * SURROUND_CHANNELS]; std::array<int, OAL_MAX_FRAMES * SURROUND_CHANNELS> surround_int32;
for (u32 i = 0; i < rendered_frames * SURROUND_CHANNELS; ++i) for (u32 i = 0; i < rendered_frames * SURROUND_CHANNELS; ++i)
{ {
@ -342,15 +342,15 @@ void OpenALStream::SoundLoop()
else if (dpl2[i] < INT_MIN) else if (dpl2[i] < INT_MIN)
surround_int32[i] = INT_MIN; surround_int32[i] = INT_MIN;
else else
surround_int32[i] = (int)dpl2[i]; surround_int32[i] = static_cast<int>(dpl2[i]);
} }
palBufferData(m_buffers[next_buffer], AL_FORMAT_51CHN32, surround_int32, palBufferData(m_buffers[next_buffer], AL_FORMAT_51CHN32, surround_int32.data(),
rendered_frames * FRAME_SURROUND_INT32, frequency); rendered_frames * FRAME_SURROUND_INT32, frequency);
} }
else else
{ {
short surround_short[OAL_MAX_FRAMES * SURROUND_CHANNELS]; std::array<short, OAL_MAX_FRAMES * SURROUND_CHANNELS> surround_short;
for (u32 i = 0; i < rendered_frames * SURROUND_CHANNELS; ++i) for (u32 i = 0; i < rendered_frames * SURROUND_CHANNELS; ++i)
{ {
@ -360,10 +360,10 @@ void OpenALStream::SoundLoop()
else if (dpl2[i] < SHRT_MIN) else if (dpl2[i] < SHRT_MIN)
surround_short[i] = SHRT_MIN; surround_short[i] = SHRT_MIN;
else else
surround_short[i] = (int)dpl2[i]; surround_short[i] = static_cast<int>(dpl2[i]);
} }
palBufferData(m_buffers[next_buffer], AL_FORMAT_51CHN16, surround_short, palBufferData(m_buffers[next_buffer], AL_FORMAT_51CHN16, surround_short.data(),
rendered_frames * FRAME_SURROUND_SHORT, frequency); rendered_frames * FRAME_SURROUND_SHORT, frequency);
} }