diff options
| author | Xpl0itR <adamdj2012@hotmail.co.uk> | 2019-05-30 21:27:43 +0100 |
|---|---|---|
| committer | emmauss <emmausssss@gmail.com> | 2019-05-30 23:27:43 +0300 |
| commit | e7be60b6c6dab16ad954b00122190e03778b8e70 (patch) | |
| tree | 06a2dc48414b95115b8a9f2d413ae3a7d423791c /Ryujinx.HLE/HOS | |
| parent | 29a9c5f0b85b149f1cbcb1b1593811c3a508aa28 (diff) | |
Add Discord Rich Presence (#681)
Diffstat (limited to 'Ryujinx.HLE/HOS')
| -rw-r--r-- | Ryujinx.HLE/HOS/Horizon.cs | 18 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index e152846e..acb6b1d1 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -98,6 +98,10 @@ namespace Ryujinx.HLE.HOS public string CurrentTitle { get; private set; } + public string TitleName { get; private set; } + + public string TitleID { get; private set; } + public IntegrityCheckLevel FsIntegrityCheckLevel { get; set; } internal long HidBaseAddress { get; private set; } @@ -233,7 +237,7 @@ namespace Ryujinx.HLE.HOS } } - CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); LoadNso("rtld"); LoadNso("main"); @@ -431,7 +435,7 @@ namespace Ryujinx.HLE.HOS } } - CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); LoadNso("rtld"); LoadNso("main"); @@ -522,11 +526,12 @@ namespace Ryujinx.HLE.HOS Nacp controlData = new Nacp(controlFile.AsStream()); - CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title; + TitleName = CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title; + TitleID = metaData.Aci0.TitleId.ToString("x16"); if (string.IsNullOrWhiteSpace(CurrentTitle)) { - CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; + TitleName = CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; } return controlData; @@ -538,7 +543,7 @@ namespace Ryujinx.HLE.HOS } else { - CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); } LoadNso("rtld"); @@ -608,6 +613,9 @@ namespace Ryujinx.HLE.HOS ContentManager.LoadEntries(); + TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleName = metaData.TitleName; + ProgramLoader.LoadStaticObjects(this, metaData, new IExecutable[] { staticObject }); } diff --git a/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs b/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs index d1d54d0e..436897ed 100644 --- a/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs +++ b/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs @@ -42,6 +42,8 @@ namespace Ryujinx.HLE.HOS.SystemState internal string ActiveAudioOutput { get; private set; } + public bool DiscordIntergrationEnabled { get; set; } + public bool DockedMode { get; set; } public ColorSet ThemeColor { get; set; } |