diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-02-17 11:20:52 +0000 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-03-26 20:15:57 +0000 |
| commit | ab711e6942757d775c08c31a6c32d488feba1dba (patch) | |
| tree | d102dc6d0e6b9c33e7205b63e3360ebd720a3ebb /src/music | |
| parent | 297fd3dda3abe353ebe2fe77c67b011e24d403bc (diff) | |
| download | openttd-ab711e6942757d775c08c31a6c32d488feba1dba.tar.xz | |
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
Diffstat (limited to 'src/music')
| -rw-r--r-- | src/music/dmusic.cpp | 2 | ||||
| -rw-r--r-- | src/music/midifile.cpp | 6 | ||||
| -rw-r--r-- | src/music/win32_m.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp index a03a6ec57..241ab191b 100644 --- a/src/music/dmusic.cpp +++ b/src/music/dmusic.cpp @@ -751,7 +751,7 @@ static void MidiThreadProc(void *) block_time = playback_start_time + block.realtime * MIDITIME_TO_REFTIME; DEBUG(driver, 9, "DMusic thread: Streaming block " PRINTF_SIZE " (cur=" OTTD_PRINTF64 ", block=" OTTD_PRINTF64 ")", current_block, (long long)(current_time / MS_TO_REFTIME), (long long)(block_time / MS_TO_REFTIME)); - byte *data = block.data.Begin(); + byte *data = block.data.data(); size_t remaining = block.data.size(); byte last_status = 0; while (remaining > 0) { diff --git a/src/music/midifile.cpp b/src/music/midifile.cpp index 82649679f..97fb2edf8 100644 --- a/src/music/midifile.cpp +++ b/src/music/midifile.cpp @@ -336,7 +336,7 @@ static bool FixupMidiData(MidiFile &target) last_ticktime = block.ticktime; } else { byte *datadest = grow(merged_blocks.back().data, block.data.size()); - memcpy(datadest, block.data.Begin(), block.data.size()); + memcpy(datadest, block.data.data(), block.data.size()); } } std::swap(merged_blocks, target.blocks); @@ -940,8 +940,8 @@ bool MidiFile::WriteSMF(const char *filename) } /* Write each block data command */ - byte *dp = block.data.Begin(); - while (dp < block.data.End()) { + byte *dp = block.data.data(); + while (dp < block.data.data() + block.data.size()) { /* Always zero delta time inside blocks */ if (needtime) { fputc(0, f); diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp index 6d88af4a3..18a3bce3e 100644 --- a/src/music/win32_m.cpp +++ b/src/music/win32_m.cpp @@ -229,7 +229,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR dwUser, DWORD_PTR, DW break; } - byte *data = block.data.Begin(); + byte *data = block.data.data(); size_t remaining = block.data.size(); byte last_status = 0; while (remaining > 0) { |