diff --git a/src/core/libraries/game_live_streaming/gamelivestreaming.cpp b/src/core/libraries/game_live_streaming/gamelivestreaming.cpp index 737839f3f..6c78a5215 100644 --- a/src/core/libraries/game_live_streaming/gamelivestreaming.cpp +++ b/src/core/libraries/game_live_streaming/gamelivestreaming.cpp @@ -59,8 +59,10 @@ int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentBroadcastScreenLayout() { return ORBIS_OK; } -int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentStatus() { - LOG_ERROR(Lib_GameLiveStreaming, "(STUBBED) called"); +int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentStatus(OrbisGameLiveStreamingStatus* status) { + status->isOnAir = false; + status->spectatorCounts = 0; + LOG_DEBUG(Lib_GameLiveStreaming, "(STUBBED) called userid = {}",status->userId); return ORBIS_OK; } diff --git a/src/core/libraries/game_live_streaming/gamelivestreaming.h b/src/core/libraries/game_live_streaming/gamelivestreaming.h index ec6cae236..468750fd1 100644 --- a/src/core/libraries/game_live_streaming/gamelivestreaming.h +++ b/src/core/libraries/game_live_streaming/gamelivestreaming.h @@ -11,6 +11,24 @@ class SymbolsResolver; namespace Libraries::GameLiveStreaming { +struct OrbisGameLiveStreamingStatus { + bool isOnAir; + u8 align[3]; + u32 spectatorCounts; + s32 userId; + u8 reserved[60]; +}; +struct OrbisGameLiveStreamingStatus2 { + s32 userId; + bool isOnAir; + u8 align[3]; + u32 spectatorCounts; + u32 textMessageCounts; + u32 commandMessageCounts; + u32 broadcastVideoResolution; + u8 reserved[48]; +}; + int PS4_SYSV_ABI sceGameLiveStreamingStartDebugBroadcast(); int PS4_SYSV_ABI sceGameLiveStreamingStopDebugBroadcast(); int PS4_SYSV_ABI sceGameLiveStreamingApplySocialFeedbackMessageFilter(); @@ -21,7 +39,7 @@ int PS4_SYSV_ABI sceGameLiveStreamingClearSpoilerTag(); int PS4_SYSV_ABI sceGameLiveStreamingEnableLiveStreaming(); int PS4_SYSV_ABI sceGameLiveStreamingEnableSocialFeedback(); int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentBroadcastScreenLayout(); -int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentStatus(); +int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentStatus(OrbisGameLiveStreamingStatus* status); int PS4_SYSV_ABI sceGameLiveStreamingGetCurrentStatus2(); int PS4_SYSV_ABI sceGameLiveStreamingGetProgramInfo(); int PS4_SYSV_ABI sceGameLiveStreamingGetSocialFeedbackMessages(); diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp index b671e0077..d786647c2 100644 --- a/src/core/libraries/pad/pad.cpp +++ b/src/core/libraries/pad/pad.cpp @@ -88,7 +88,7 @@ int PS4_SYSV_ABI scePadGetCapability() { } int PS4_SYSV_ABI scePadGetControllerInformation(s32 handle, OrbisPadControllerInformation* pInfo) { - LOG_INFO(Lib_Pad, "called handle = {}", handle); + LOG_DEBUG(Lib_Pad, "called handle = {}", handle); if (handle < 0) { pInfo->touchPadInfo.pixelDensity = 1; pInfo->touchPadInfo.resolution.x = 1920; diff --git a/src/core/libraries/remote_play/remoteplay.cpp b/src/core/libraries/remote_play/remoteplay.cpp index 0d52e4b89..b7402173e 100644 --- a/src/core/libraries/remote_play/remoteplay.cpp +++ b/src/core/libraries/remote_play/remoteplay.cpp @@ -54,8 +54,8 @@ int PS4_SYSV_ABI sceRemoteplayGetConnectHistory() { return ORBIS_OK; } -int PS4_SYSV_ABI sceRemoteplayGetConnectionStatus() { - LOG_ERROR(Lib_Remoteplay, "(STUBBED) called"); +int PS4_SYSV_ABI sceRemoteplayGetConnectionStatus(s32 userId, int* pStatus) { + *pStatus = ORBIS_REMOTEPLAY_CONNECTION_STATUS_DISCONNECT; return ORBIS_OK; } diff --git a/src/core/libraries/remote_play/remoteplay.h b/src/core/libraries/remote_play/remoteplay.h index b17cbe7b0..979f73a9e 100644 --- a/src/core/libraries/remote_play/remoteplay.h +++ b/src/core/libraries/remote_play/remoteplay.h @@ -9,6 +9,10 @@ namespace Core::Loader { class SymbolsResolver; } +// returning codes in sceRemoteplayGetConnectionStatus pstatus +constexpr int ORBIS_REMOTEPLAY_CONNECTION_STATUS_DISCONNECT = 0; +constexpr int ORBIS_REMOTEPLAY_CONNECTION_STATUS_CONNECT = 1; + namespace Libraries::Remoteplay { int PS4_SYSV_ABI sceRemoteplayApprove(); @@ -20,7 +24,7 @@ int PS4_SYSV_ABI sceRemoteplayDisconnect(); int PS4_SYSV_ABI sceRemoteplayGeneratePinCode(); int PS4_SYSV_ABI sceRemoteplayGetApMode(); int PS4_SYSV_ABI sceRemoteplayGetConnectHistory(); -int PS4_SYSV_ABI sceRemoteplayGetConnectionStatus(); +int PS4_SYSV_ABI sceRemoteplayGetConnectionStatus(s32 userId, int* pStatus); int PS4_SYSV_ABI sceRemoteplayGetConnectUserId(); int PS4_SYSV_ABI sceRemoteplayGetMbusDeviceInfo(); int PS4_SYSV_ABI sceRemoteplayGetOperationStatus(); diff --git a/src/core/libraries/system/userservice.cpp b/src/core/libraries/system/userservice.cpp index 560855474..140ca8921 100644 --- a/src/core/libraries/system/userservice.cpp +++ b/src/core/libraries/system/userservice.cpp @@ -491,7 +491,7 @@ int PS4_SYSV_ABI sceUserServiceGetImeRunCount() { } s32 PS4_SYSV_ABI sceUserServiceGetInitialUser(int* user_id) { - LOG_INFO(Lib_UserService, "called"); + LOG_DEBUG(Lib_UserService, "called"); if (user_id == nullptr) { LOG_ERROR(Lib_UserService, "user_id is null"); return ORBIS_USER_SERVICE_ERROR_INVALID_ARGUMENT;