Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SS4S Update #57

Merged
merged 2 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions app/backend/stream/stream_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}


Expand Down
1 change: 0 additions & 1 deletion app/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion third_party/ss4s
Submodule ss4s updated 54 files
+19 −2 CMakeLists.txt
+0 −58 cmake/ExternalWebOSUserland.cmake
+12 −0 mocks/CMakeLists.txt
+3 −0 mocks/NDL_directmedia/CMakeLists.txt
+53 −0 mocks/NDL_directmedia/ndl_directmedia_mock.c
+10 −0 mocks/NDL_directmedia/ndl_directmedia_mock.h
+112 −0 mocks/NDL_directmedia/ndl_directmedia_v1.c
+65 −0 mocks/NDL_directmedia/ndl_directmedia_v2.c
+72 −0 mocks/include/appswitching-control-block/AcbAPI.h
+14 −0 mocks/include/lgncopenapi/lgnc.h
+91 −0 mocks/include/lgncopenapi/lgnc_directaudio.h
+65 −0 mocks/include/lgncopenapi/lgnc_directvideo.h
+15 −0 mocks/include/lgncopenapi/lgnc_dl.h
+31 −0 mocks/include/lgncopenapi/lgnc_egl.h
+24 −0 mocks/include/lgncopenapi/lgnc_gamepad.h
+86 −0 mocks/include/lgncopenapi/lgnc_openapi_types.h
+36 −0 mocks/include/lgncopenapi/lgnc_plugin.h
+136 −0 mocks/include/lgncopenapi/lgnc_system.h
+11 −0 mocks/include/libndl-media/NDL_directmedia.h
+47 −0 mocks/include/libndl-media/NDL_directmedia_common.h
+236 −0 mocks/include/libndl-media/NDL_directmedia_types.h
+121 −0 mocks/include/libndl-media/NDL_directmedia_v1.h
+141 −0 mocks/include/libndl-media/NDL_directmedia_v2.h
+117 −0 mocks/include/starfish-media-pipeline/StarfishMediaAPIs.h
+2 −0 mocks/lgncopenapi/CMakeLists.txt
+43 −0 mocks/lgncopenapi/lgnc_directaudio.c
+61 −0 mocks/lgncopenapi/lgnc_directvideo.c
+21 −0 mocks/lgncopenapi/lgnc_mock.c
+5 −0 mocks/lgncopenapi/lgnc_mock.h
+22 −0 mocks/lgncopenapi/lgnc_plugin.c
+6 −0 modules/pulse/pulse.c
+2 −4 modules/webos/CMakeLists.txt
+3 −6 modules/webos/lgnc/CMakeLists.txt
+3 −13 modules/webos/lgnc/lgnc_audio.c
+0 −2 modules/webos/lgnc/lgnc_common.h
+0 −1 modules/webos/lgnc/lgnc_module.c
+3 −17 modules/webos/lgnc/lgnc_video.c
+1 −4 modules/webos/ndl/CMakeLists.txt
+10 −17 modules/webos/ndl/webos4/ndl_module.c
+2 −4 modules/webos/ndl/webos4/ndl_video.c
+1 −1 modules/webos/ndl/webos5/ndl_audio.c
+14 −13 modules/webos/smp/CMakeLists.txt
+3 −3 src/audio.c
+3 −0 src/lib_logging.h
+8 −11 src/library.c
+6 −2 src/mutex.h
+14 −2 src/mutex_pthread.c
+3 −3 src/video.c
+9 −1 tests/CMakeLists.txt
+45 −0 tests/nalu_reader.h
+140 −0 tests/test_av_threaded.c
+25 −0 tests/test_common.h
+16 −35 tests/test_h264_playback.c
+2 −17 tests/test_pcm_playback.c