mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::array's fill over memset

pull/10004/merge
Rubidium 2025-05-06 18:13:15 +02:00 committed by rubidium42
parent 4c1cd4fe4c
commit 0d922c9d62
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/music/win32_m.cpp
View File

@ -18,7 +18,6 @@
#include "midi.h" #include "midi.h"
#include "../base_media_base.h" #include "../base_media_base.h"
#include "../base_media_music.h" #include "../base_media_music.h"
#include "../core/mem_func.hpp"
#include <mutex> #include <mutex>
#include "../safeguards.h" #include "../safeguards.h"
@ -48,7 +47,7 @@ static struct {
MidiFile next_file; ///< upcoming file to play MidiFile next_file; ///< upcoming file to play
PlaybackSegment next_segment; ///< segment info for upcoming file PlaybackSegment next_segment; ///< segment info for upcoming file
uint8_t channel_volumes[16]; ///< last seen volume controller values in raw data std::array<uint8_t, 16> channel_volumes; ///< last seen volume controller values in raw data
} _midi; } _midi;
static FMusicDriver_Win32 iFMusicDriver_Win32; static FMusicDriver_Win32 iFMusicDriver_Win32;
@ -163,7 +162,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR
_midi.do_start = 0; _midi.do_start = 0;
_midi.current_block = 0; _midi.current_block = 0;
MemSetT<uint8_t>(_midi.channel_volumes, 127, lengthof(_midi.channel_volumes)); _midi.channel_volumes.fill(127);
/* Invalidate current volume. */ /* Invalidate current volume. */
_midi.current_volume = UINT8_MAX; _midi.current_volume = UINT8_MAX;
volume_throttle = 0; volume_throttle = 0;