From 429a27cd75936f15c034b920f915ed0a72fbe3c5 Mon Sep 17 00:00:00 2001
From: jduncanator <jduncanator@hotmail.com>
Date: Thu, 14 Nov 2019 16:05:42 +1100
Subject: [PATCH] More reorganisation

---
 Ryujinx.HLE/HOS/Applets/AppletManager.cs                    | 3 ++-
 Ryujinx.HLE/HOS/Applets/IApplet.cs                          | 2 +-
 Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs  | 2 +-
 .../SystemAppletProxy/ILibraryAppletCreator.cs              | 6 +++---
 Ryujinx.HLE/HOS/Services/Am/{ => AppletAE}/AppletFifo.cs    | 2 +-
 .../HOS/{Applets => Services/Am/AppletAE}/AppletId.cs       | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename Ryujinx.HLE/HOS/Services/Am/{ => AppletAE}/AppletFifo.cs (97%)
 rename Ryujinx.HLE/HOS/{Applets => Services/Am/AppletAE}/AppletId.cs (94%)

diff --git a/Ryujinx.HLE/HOS/Applets/AppletManager.cs b/Ryujinx.HLE/HOS/Applets/AppletManager.cs
index 6bfc8d7f30..e5426cd758 100644
--- a/Ryujinx.HLE/HOS/Applets/AppletManager.cs
+++ b/Ryujinx.HLE/HOS/Applets/AppletManager.cs
@@ -1,4 +1,5 @@
-using System;
+using Ryujinx.HLE.HOS.Services.Am.AppletAE;
+using System;
 using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Applets
diff --git a/Ryujinx.HLE/HOS/Applets/IApplet.cs b/Ryujinx.HLE/HOS/Applets/IApplet.cs
index ae8d522e6d..aa248bf599 100644
--- a/Ryujinx.HLE/HOS/Applets/IApplet.cs
+++ b/Ryujinx.HLE/HOS/Applets/IApplet.cs
@@ -1,4 +1,4 @@
-using Ryujinx.HLE.HOS.Services.Am;
+using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using System;
 
 namespace Ryujinx.HLE.HOS.Applets
diff --git a/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs b/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
index 18e56e7791..7658c6db13 100644
--- a/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
+++ b/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
@@ -1,5 +1,5 @@
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.HOS.Services.Am;
+using Ryujinx.HLE.HOS.Services.Am.AppletAE;
 using System;
 using System.IO;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
index 1fbad89814..094ed30508 100644
--- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs
@@ -11,10 +11,10 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // CreateLibraryApplet(u32, u32) -> object<nn::am::service::ILibraryAppletAccessor>
         public ResultCode CreateLibraryApplet(ServiceCtx context)
         {
-            int appletId          = context.RequestData.ReadInt32();
-            int libraryAppletMode = context.RequestData.ReadInt32();
+            AppletId appletId          = (AppletId)context.RequestData.ReadInt32();
+            int      libraryAppletMode = context.RequestData.ReadInt32();
 
-            MakeObject(context, new ILibraryAppletAccessor((AppletId)appletId, context.Device.System));
+            MakeObject(context, new ILibraryAppletAccessor(appletId, context.Device.System));
 
             return ResultCode.Success;
         }
diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletFifo.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs
similarity index 97%
rename from Ryujinx.HLE/HOS/Services/Am/AppletFifo.cs
rename to Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs
index 215ebfadfc..2391ba5e2a 100644
--- a/Ryujinx.HLE/HOS/Services/Am/AppletFifo.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletFifo.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.HOS.Services.Am
+namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
 {
     internal class AppletFifo<T> : IEnumerable<T>
     {
diff --git a/Ryujinx.HLE/HOS/Applets/AppletId.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletId.cs
similarity index 94%
rename from Ryujinx.HLE/HOS/Applets/AppletId.cs
rename to Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletId.cs
index ada21ae3fb..917f68658b 100644
--- a/Ryujinx.HLE/HOS/Applets/AppletId.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AppletId.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.HOS.Applets
+namespace Ryujinx.HLE.HOS.Services.Am.AppletAE
 {
     enum AppletId
     {