From 2fa1be66102015b6ffc9748c52bb883393791e00 Mon Sep 17 00:00:00 2001 From: Ningyuan Li Date: Wed, 27 Mar 2024 00:10:33 +0900 Subject: [PATCH 1/2] updated ss4s --- third_party/ss4s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/ss4s b/third_party/ss4s index 1cd5caa..38e00fb 160000 --- a/third_party/ss4s +++ b/third_party/ss4s @@ -1 +1 @@ -Subproject commit 1cd5caa3525516382302d875ee64c1aeef30d47c +Subproject commit 38e00fb492259d2f47154d949355340fddfe407a From 67cbbc2dc168cd3b825551efa6b7c600e5eba050 Mon Sep 17 00:00:00 2001 From: Ningyuan Li Date: Wed, 27 Mar 2024 00:11:52 +0900 Subject: [PATCH 2/2] updated SDL2 --- CMakeLists.txt | 2 -- app/backend/stream/stream_manager.c | 2 -- app/config.h.in | 1 - 3 files changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a66f1fb..5e7f45d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/core/scripts ${CMAKE_SOURCE_DI option(IHSPLAY_WIP_FEATURES "Enable Work-in-Progress Features" OFF) option(IHSPLAY_FEATURE_FORCE_FULLSCREEN "Force full screen mode" OFF) -set(IHSPLAY_FEATURE_RELMOUSE ON) set(IHSPLAY_FEATURE_LIBCEC ON) option(COMMONS_LV_SDL_IMG_USE_IMAGE "Don't use SDL_Image" OFF) @@ -117,7 +116,6 @@ target_link_libraries(ihsplay PRIVATE ${SDL2_LIBRARIES} ${OPUS_LIBRARIES} Fontco ${MBEDCRYPTO_LIBRARY}) if (TARGET_WEBOS) - set(IHSPLAY_FEATURE_RELMOUSE OFF) set(IHSPLAY_FEATURE_LIBCEC OFF) set(IHSPLAY_FEATURE_FORCE_FULLSCREEN ON) target_link_libraries(ihsplay PRIVATE commons-luna-sync) diff --git a/app/backend/stream/stream_manager.c b/app/backend/stream/stream_manager.c index 3e7f696..98c3095 100644 --- a/app/backend/stream/stream_manager.c +++ b/app/backend/stream/stream_manager.c @@ -394,13 +394,11 @@ static void controller_back_released(stream_manager_t *manager) { } static void grab_mouse(stream_manager_t *manager, bool grab) { -#if IHSPLAY_FEATURE_RELMOUSE if (manager->state != STREAM_MANAGER_STATE_STREAMING) { SDL_SetRelativeMouseMode(SDL_FALSE); return; } SDL_SetRelativeMouseMode(grab ? SDL_TRUE : SDL_FALSE); -#endif } diff --git a/app/config.h.in b/app/config.h.in index 0370877..4b0bb0d 100644 --- a/app/config.h.in +++ b/app/config.h.in @@ -4,6 +4,5 @@ #define SS4S_MODULES_INI_PATH "@SS4S_MODULES_INI_PATH_RUNTIME@" #cmakedefine01 IHSPLAY_IS_DEBUG #cmakedefine01 IHSPLAY_WIP_FEATURES -#cmakedefine01 IHSPLAY_FEATURE_RELMOUSE #cmakedefine01 IHSPLAY_FEATURE_FORCE_FULLSCREEN #cmakedefine01 IHSPLAY_FEATURE_LIBCEC \ No newline at end of file