diff options
author | 2021-02-14 11:05:57 -0500 | |
---|---|---|
committer | 2021-02-14 11:05:57 -0500 | |
commit | bc0146c2038c46f789a246d5616afd7c425157f3 (patch) | |
tree | b4d39194034b4c6e56ccd4035d25636034be43ca /src/emu/sound.cpp | |
parent | 91310bcdeb7ab0ff661738b212017bf836f4e8ad (diff) |
Eliminate ARRAY_LENGTH template in favor of C++17's std::size
* osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h
* sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration
* gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset
* emucore.h: Remove obsolete typedef
Diffstat (limited to 'src/emu/sound.cpp')
-rw-r--r-- | src/emu/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/sound.cpp b/src/emu/sound.cpp index 625f0e989e6..7ee663aba69 100644 --- a/src/emu/sound.cpp +++ b/src/emu/sound.cpp @@ -105,7 +105,7 @@ void stream_buffer::set_sample_rate(u32 rate, bool resample) // voice when jumping off the edge in Q*Bert; without this extra effort // it is crackly and/or glitchy at times sample_t buffer[64]; - int buffered_samples = std::min(m_sample_rate, std::min(rate, u32(ARRAY_LENGTH(buffer)))); + int buffered_samples = std::min(m_sample_rate, std::min(rate, u32(std::size(buffer)))); // if the new rate is lower, downsample into our holding buffer; // otherwise just copy into our holding buffer for later upsampling @@ -203,12 +203,12 @@ void stream_buffer::flush_wav() // iterate over chunks for conversion s16 buffer[1024]; - for (int samplebase = 0; samplebase < view.samples(); samplebase += ARRAY_LENGTH(buffer)) + for (int samplebase = 0; samplebase < view.samples(); samplebase += std::size(buffer)) { // clamp to the buffer size int cursamples = view.samples() - samplebase; - if (cursamples > ARRAY_LENGTH(buffer)) - cursamples = ARRAY_LENGTH(buffer); + if (cursamples > std::size(buffer)) + cursamples = std::size(buffer); // convert and fill for (int sampindex = 0; sampindex < cursamples; sampindex++) |