diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-11-25 01:28:36 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 01:28:36 -0300 |
| commit | 2c7b4c2053e36d33d19298debe611edc7b74743c (patch) | |
| tree | e6cdb3b7493baff1a38b3ec008e69e12a39f09ae | |
| parent | bc2e8d99e5ae0dbd69e712cc71da3033f5f30139 (diff) | |
| parent | ac92c147c681f74d4ffe843a2e332e43c662ff27 (diff) | |
Merge pull request #13261 from ISylvox/fix-windows-build
Complete bc2e8d9 so that Windows can be built
| -rw-r--r-- | drivers/wasapi/audio_driver_wasapi.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index 0671ee408e..2c87fb58db 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -214,7 +214,7 @@ void AudioDriverWASAPI::thread_func(void *p_udata) { if (ad->active) { ad->lock(); - ad->audio_server_process(ad->buffer_frames, ad->samples_in.ptr()); + ad->audio_server_process(ad->buffer_frames, ad->samples_in.ptrw()); ad->unlock(); } else { diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index c189b3b744..827189bb4f 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1843,7 +1843,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments, modstr.resize(cmdline.size()); for (int i = 0; i < cmdline.size(); i++) modstr[i] = cmdline[i]; - int ret = CreateProcessW(NULL, modstr.ptr(), NULL, NULL, 0, NORMAL_PRIORITY_CLASS, NULL, NULL, si_w, &pi.pi); + int ret = CreateProcessW(NULL, modstr.ptrw(), NULL, NULL, 0, NORMAL_PRIORITY_CLASS, NULL, NULL, si_w, &pi.pi); ERR_FAIL_COND_V(ret == 0, ERR_CANT_FORK); if (p_blocking) { |