diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-04-28 11:04:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-28 11:04:05 +0200 |
commit | 305b2a15bf1ed950e8e2ed50fa84456b584798fb (patch) | |
tree | abaa1e01ca34382f4ea1d6e24c403ecff1502f39 /scene/resources/audio_stream_sample.cpp | |
parent | 7bca90769cbf7ae29023ca8d83ba7ab3137deda3 (diff) | |
parent | 8247667a3ee0d86f26094e722497b0cbb99cc12b (diff) |
Merge pull request #48239 from akien-mga/goodbye-copymem
Core: Drop custom `copymem`/`zeromem` defines
Diffstat (limited to 'scene/resources/audio_stream_sample.cpp')
-rw-r--r-- | scene/resources/audio_stream_sample.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/audio_stream_sample.cpp b/scene/resources/audio_stream_sample.cpp index 06a91fb2f8..9a9f019dda 100644 --- a/scene/resources/audio_stream_sample.cpp +++ b/scene/resources/audio_stream_sample.cpp @@ -490,9 +490,9 @@ void AudioStreamSample::set_data(const Vector<uint8_t> &p_data) { const uint8_t *r = p_data.ptr(); int alloc_len = datalen + DATA_PAD * 2; data = memalloc(alloc_len); //alloc with some padding for interpolation - zeromem(data, alloc_len); + memset(data, 0, alloc_len); uint8_t *dataptr = (uint8_t *)data; - copymem(dataptr + DATA_PAD, r, datalen); + memcpy(dataptr + DATA_PAD, r, datalen); data_bytes = datalen; } @@ -507,7 +507,7 @@ Vector<uint8_t> AudioStreamSample::get_data() const { { uint8_t *w = pv.ptrw(); uint8_t *dataptr = (uint8_t *)data; - copymem(w, dataptr + DATA_PAD, data_bytes); + memcpy(w, dataptr + DATA_PAD, data_bytes); } } |