updated SDL2

mariotaku · Mar 26, 2024 · 67cbbc2 · 67cbbc2
1 parent 2fa1be6
commit 67cbbc2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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