jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake, libobs, win-capture: Fix VS2017 warnings

master
jp9000 2018-03-12 16:16:38 -07:00
parent 1d391166d0
commit 4b54bde426
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -60,7 +60,7 @@ elseif(MSVC)
endif()
# Disable pointless constant condition warnings
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127 /wd4201")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127 /wd4201 /wd4456 /wd4457 /wd4458 /wd4459 /wd4595")
endif()
if(WIN32)

6
libobs/audio-monitoring/win32/wasapi-output.h
View File

@ -3,10 +3,16 @@
#include <audioclient.h>
#ifndef KSAUDIO_SPEAKER_2POINT1
#define KSAUDIO_SPEAKER_2POINT1 (KSAUDIO_SPEAKER_STEREO|SPEAKER_LOW_FREQUENCY)
#endif
#define KSAUDIO_SPEAKER_SURROUND_AVUTIL \
(KSAUDIO_SPEAKER_STEREO|SPEAKER_FRONT_CENTER)
#ifndef KSAUDIO_SPEAKER_4POINT1
#define KSAUDIO_SPEAKER_4POINT1 (KSAUDIO_SPEAKER_SURROUND|SPEAKER_LOW_FREQUENCY)
#endif
#define safe_release(ptr) \
do { \

3
libobs/obs-output.c
View File

@ -2061,7 +2061,8 @@ static struct caption_text *caption_text_new(const char *text, size_t bytes,
struct caption_text *tail, struct caption_text **head)
{
struct caption_text *next = bzalloc(sizeof(struct caption_text));
snprintf(&next->text[0], CAPTION_LINE_BYTES + 1, "%.*s", bytes, text);
snprintf(&next->text[0], CAPTION_LINE_BYTES + 1, "%.*s",
(int)bytes, text);
if (!*head) {
*head = next;

5
plugins/win-capture/game-capture.c
View File

@ -456,7 +456,7 @@ static bool hotkey_start(void *data, obs_hotkey_pair_id id,
if (pressed && gc->config.mode == CAPTURE_MODE_HOTKEY) {
info("Activate hotkey pressed");
os_atomic_set_long(&gc->hotkey_window,
(long)GetForegroundWindow());
(long)(uintptr_t)GetForegroundWindow());
os_atomic_set_bool(&gc->deactivate_hook, true);
os_atomic_set_bool(&gc->activate_hook_now, true);
}
@ -1582,7 +1582,8 @@ static void game_capture_tick(void *data, float seconds)
bool activate_now = os_atomic_set_bool(&gc->activate_hook_now, false);
if (activate_now) {
HWND hwnd = (HWND)os_atomic_load_long(&gc->hotkey_window);
HWND hwnd = (HWND)(uintptr_t)os_atomic_load_long(
&gc->hotkey_window);
if (is_uwp_window(hwnd))
hwnd = get_uwp_actual_window(hwnd);

4
plugins/win-capture/nt-stuff.h
View File

@ -140,7 +140,7 @@ static bool thread_is_suspended(DWORD process_id, DWORD thread_id)
OBS_SYSTEM_PROCESS_INFORMATION2 *spi = data;
for (;;) {
if (spi->UniqueProcessId == (HANDLE)process_id) {
if (spi->UniqueProcessId == (HANDLE)(DWORD_PTR)process_id) {
break;
}
@ -156,7 +156,7 @@ static bool thread_is_suspended(DWORD process_id, DWORD thread_id)
sti = (OBS_SYSTEM_THREAD_INFORMATION*)((BYTE*)spi + sizeof(*spi));
for (ULONG i = 0; i < spi->ThreadCount; i++) {
if (sti[i].UniqueThreadId == (HANDLE)thread_id) {
if (sti[i].UniqueThreadId == (HANDLE)(DWORD_PTR)thread_id) {
info = &sti[i];
break;
}