Skip to content
This repository was archived by the owner on Mar 28, 2026. It is now read-only.

Commit e013100

Browse files
authored
Merge pull request #1100 from jellyfin/macos_cursor
Fix macos cursor hiding when outside of Jellyfin Desktop
2 parents f3d2382 + cd8698c commit e013100

31 files changed

+119
-347
lines changed

CMakeModules/AppleConfiguration.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ find_Library(CARBON Carbon)
66
find_library(SECURITY Security)
77
find_library(MEDIAPLAYER MediaPlayer)
88

9-
set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} hidremote plistparser letsmove)
9+
set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} hidremote letsmove)
1010
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework MediaPlayer")
1111
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
1212
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.15 -fno-omit-frame-pointer")

CMakeModules/CompilerFlags.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ if(NOT MSVC)
1010
enable_if_supported(COMPILER_FLAGS "-Wmissing-include-dirs")
1111
enable_if_supported(COMPILER_FLAGS "-Woverloaded-virtual")
1212
enable_if_supported(COMPILER_FLAGS "-Wold-style-cast")
13+
enable_if_supported(COMPILER_FLAGS "-Wsign-compare")
14+
enable_if_supported(COMPILER_FLAGS "-Wdeprecated-declarations")
1315
endif()
1416

1517
enable_if_supported(COMPILER_FLAGS "-Wshorten-64-to-32")

external/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS_THIRD_PARTY}")
22
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS_THIRD_PARTY}")
33

44
if(APPLE)
5-
add_subdirectory(plistparser)
65
add_subdirectory(HIDRemote)
76
add_subdirectory(letsmove)
87
endif(APPLE)

external/plistparser/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

external/plistparser/LICENSE

Lines changed: 0 additions & 22 deletions
This file was deleted.

external/plistparser/plistparser.cpp

Lines changed: 0 additions & 98 deletions
This file was deleted.

external/plistparser/plistparser.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

external/plistparser/plistserializer.cpp

Lines changed: 0 additions & 83 deletions
This file was deleted.

external/plistparser/plistserializer.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

native/inputPlugin.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,7 @@ class inputPlugin {
172172

173173
const state = playbackManager.getPlayerState();
174174
if (state && state.NowPlayingItem) {
175-
let serverAddress = '';
176-
if (window.ApiClient && typeof window.ApiClient.serverAddress === 'function') {
177-
serverAddress = window.ApiClient.serverAddress();
178-
}
179-
180-
api.player.notifyMetadata(state.NowPlayingItem, serverAddress || '');
175+
api.player.notifyMetadata(state.NowPlayingItem);
181176

182177
const initialPos = playbackManager.currentTime();
183178
if (initialPos !== undefined && initialPos !== null) {

0 commit comments

Comments
 (0)