Added HDCP authentication state event and stubs
This commit is contained in:
parent
009aa57f4a
commit
01d9c403f2
4 changed files with 25 additions and 3 deletions
|
@ -9,7 +9,7 @@ namespace Service::AM {
|
||||||
LifecycleManager::LifecycleManager(Core::System& system, KernelHelpers::ServiceContext& context,
|
LifecycleManager::LifecycleManager(Core::System& system, KernelHelpers::ServiceContext& context,
|
||||||
bool is_application)
|
bool is_application)
|
||||||
: m_system_event(context), m_operation_mode_changed_system_event(context),
|
: m_system_event(context), m_operation_mode_changed_system_event(context),
|
||||||
m_is_application(is_application) {}
|
m_hdcp_state_changed_event(context), m_is_application(is_application) {}
|
||||||
|
|
||||||
LifecycleManager::~LifecycleManager() = default;
|
LifecycleManager::~LifecycleManager() = default;
|
||||||
|
|
||||||
|
@ -21,6 +21,10 @@ Event& LifecycleManager::GetOperationModeChangedSystemEvent() {
|
||||||
return m_operation_mode_changed_system_event;
|
return m_operation_mode_changed_system_event;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Event& LifecycleManager::GetHDCPStateChangedEvent() {
|
||||||
|
return m_hdcp_state_changed_event;
|
||||||
|
}
|
||||||
|
|
||||||
void LifecycleManager::PushUnorderedMessage(AppletMessage message) {
|
void LifecycleManager::PushUnorderedMessage(AppletMessage message) {
|
||||||
m_unordered_messages.push_back(message);
|
m_unordered_messages.push_back(message);
|
||||||
this->SignalSystemEventIfNeeded();
|
this->SignalSystemEventIfNeeded();
|
||||||
|
|
|
@ -42,6 +42,7 @@ public:
|
||||||
public:
|
public:
|
||||||
Event& GetSystemEvent();
|
Event& GetSystemEvent();
|
||||||
Event& GetOperationModeChangedSystemEvent();
|
Event& GetOperationModeChangedSystemEvent();
|
||||||
|
Event& GetHDCPStateChangedEvent();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool IsApplication() {
|
bool IsApplication() {
|
||||||
|
@ -145,12 +146,14 @@ private:
|
||||||
private:
|
private:
|
||||||
Event m_system_event;
|
Event m_system_event;
|
||||||
Event m_operation_mode_changed_system_event;
|
Event m_operation_mode_changed_system_event;
|
||||||
|
Event m_hdcp_state_changed_event;
|
||||||
|
|
||||||
std::list<AppletMessage> m_unordered_messages{};
|
std::list<AppletMessage> m_unordered_messages{};
|
||||||
|
|
||||||
bool m_is_application{};
|
bool m_is_application{};
|
||||||
bool m_focus_state_changed_notification_enabled{true};
|
bool m_focus_state_changed_notification_enabled{true};
|
||||||
bool m_operation_mode_changed_notification_enabled{true};
|
bool m_operation_mode_changed_notification_enabled{true};
|
||||||
|
bool m_hdcp_state_changed_notification_enabled{true};
|
||||||
bool m_performance_mode_changed_notification_enabled{true};
|
bool m_performance_mode_changed_notification_enabled{true};
|
||||||
bool m_resume_notification_enabled{};
|
bool m_resume_notification_enabled{};
|
||||||
|
|
||||||
|
|
|
@ -48,8 +48,8 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_, std::shared_ptr<Ap
|
||||||
{59, nullptr, "SetVrPositionForDebug"},
|
{59, nullptr, "SetVrPositionForDebug"},
|
||||||
{60, D<&ICommonStateGetter::GetDefaultDisplayResolution>, "GetDefaultDisplayResolution"},
|
{60, D<&ICommonStateGetter::GetDefaultDisplayResolution>, "GetDefaultDisplayResolution"},
|
||||||
{61, D<&ICommonStateGetter::GetDefaultDisplayResolutionChangeEvent>, "GetDefaultDisplayResolutionChangeEvent"},
|
{61, D<&ICommonStateGetter::GetDefaultDisplayResolutionChangeEvent>, "GetDefaultDisplayResolutionChangeEvent"},
|
||||||
{62, nullptr, "GetHdcpAuthenticationState"},
|
{62, D<&ICommonStateGetter::GetHdcpAuthenticationState>, "GetHdcpAuthenticationState"},
|
||||||
{63, nullptr, "GetHdcpAuthenticationStateChangeEvent"},
|
{63, D<&ICommonStateGetter::GetHdcpAuthenticationStateChangeEvent>, "GetHdcpAuthenticationStateChangeEvent"},
|
||||||
{64, nullptr, "SetTvPowerStateMatchingMode"},
|
{64, nullptr, "SetTvPowerStateMatchingMode"},
|
||||||
{65, nullptr, "GetApplicationIdByContentActionName"},
|
{65, nullptr, "GetApplicationIdByContentActionName"},
|
||||||
{66, &ICommonStateGetter::SetCpuBoostMode, "SetCpuBoostMode"},
|
{66, &ICommonStateGetter::SetCpuBoostMode, "SetCpuBoostMode"},
|
||||||
|
@ -140,6 +140,19 @@ Result ICommonStateGetter::GetDefaultDisplayResolutionChangeEvent(
|
||||||
R_SUCCEED();
|
R_SUCCEED();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Result ICommonStateGetter::GetHdcpAuthenticationState(Out<s32> out_state) {
|
||||||
|
LOG_DEBUG(Service_AM, "called");
|
||||||
|
*out_state = 1;
|
||||||
|
R_SUCCEED();
|
||||||
|
}
|
||||||
|
|
||||||
|
Result ICommonStateGetter::GetHdcpAuthenticationStateChangeEvent(
|
||||||
|
OutCopyHandle<Kernel::KReadableEvent> out_event) {
|
||||||
|
LOG_DEBUG(Service_AM, "called");
|
||||||
|
*out_event = m_applet->lifecycle_manager.GetHDCPStateChangedEvent().GetHandle();
|
||||||
|
R_SUCCEED();
|
||||||
|
}
|
||||||
|
|
||||||
Result ICommonStateGetter::GetOperationMode(Out<OperationMode> out_operation_mode) {
|
Result ICommonStateGetter::GetOperationMode(Out<OperationMode> out_operation_mode) {
|
||||||
const bool use_docked_mode{Settings::IsDockedMode()};
|
const bool use_docked_mode{Settings::IsDockedMode()};
|
||||||
LOG_DEBUG(Service_AM, "called, use_docked_mode={}", use_docked_mode);
|
LOG_DEBUG(Service_AM, "called, use_docked_mode={}", use_docked_mode);
|
||||||
|
|
|
@ -35,6 +35,8 @@ private:
|
||||||
Result GetWriterLockAccessorEx(Out<SharedPointer<ILockAccessor>> out_lock_accessor,
|
Result GetWriterLockAccessorEx(Out<SharedPointer<ILockAccessor>> out_lock_accessor,
|
||||||
u32 button_type);
|
u32 button_type);
|
||||||
Result GetDefaultDisplayResolutionChangeEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
|
Result GetDefaultDisplayResolutionChangeEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
|
||||||
|
Result GetHdcpAuthenticationState(Out<s32> out_state);
|
||||||
|
Result GetHdcpAuthenticationStateChangeEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
|
||||||
Result GetOperationMode(Out<OperationMode> out_operation_mode);
|
Result GetOperationMode(Out<OperationMode> out_operation_mode);
|
||||||
Result GetPerformanceMode(Out<APM::PerformanceMode> out_performance_mode);
|
Result GetPerformanceMode(Out<APM::PerformanceMode> out_performance_mode);
|
||||||
Result GetCradleFwVersion(OutArray<uint32_t, 4> out_version);
|
Result GetCradleFwVersion(OutArray<uint32_t, 4> out_version);
|
||||||
|
|
Loading…
Reference in a new issue