From 70709ab5bfcae250eb6513fd6786ce8d2aaedc23 Mon Sep 17 00:00:00 2001
From: jduncanator <jduncanator@hotmail.com>
Date: Thu, 14 Nov 2019 15:34:27 +1100
Subject: [PATCH] Reorganise AppletFifo

---
 Ryujinx.HLE/HOS/Applets/AppletManager.cs                     | 2 +-
 Ryujinx.HLE/HOS/Applets/IApplet.cs                           | 2 +-
 .../PlayerSelect/{PlayerSelect.cs => PlayerSelectApplet.cs}  | 5 +++--
 Ryujinx.HLE/HOS/{Applets => Services/Am}/AppletFifo.cs       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename Ryujinx.HLE/HOS/Applets/PlayerSelect/{PlayerSelect.cs => PlayerSelectApplet.cs} (90%)
 rename Ryujinx.HLE/HOS/{Applets => Services/Am}/AppletFifo.cs (97%)

diff --git a/Ryujinx.HLE/HOS/Applets/AppletManager.cs b/Ryujinx.HLE/HOS/Applets/AppletManager.cs
index 8afd4c5997..6bfc8d7f30 100644
--- a/Ryujinx.HLE/HOS/Applets/AppletManager.cs
+++ b/Ryujinx.HLE/HOS/Applets/AppletManager.cs
@@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Applets
         {
             _appletMapping = new Dictionary<AppletId, Type>
             {
-                { AppletId.PlayerSelect, typeof(PlayerSelect) }
+                { AppletId.PlayerSelect, typeof(PlayerSelectApplet) }
             };
         }
 
diff --git a/Ryujinx.HLE/HOS/Applets/IApplet.cs b/Ryujinx.HLE/HOS/Applets/IApplet.cs
index aa248bf599..ae8d522e6d 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.AppletAE;
+using Ryujinx.HLE.HOS.Services.Am;
 using System;
 
 namespace Ryujinx.HLE.HOS.Applets
diff --git a/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelect.cs b/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
similarity index 90%
rename from Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelect.cs
rename to Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
index a7e63b616d..18e56e7791 100644
--- a/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelect.cs
+++ b/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
@@ -1,10 +1,11 @@
 using Ryujinx.HLE.HOS.Services.Account.Acc;
+using Ryujinx.HLE.HOS.Services.Am;
 using System;
 using System.IO;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-    internal class PlayerSelect : IApplet
+    internal class PlayerSelectApplet : IApplet
     {
         private Horizon _system;
 
@@ -13,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Applets
 
         public event EventHandler AppletStateChanged;
 
-        public PlayerSelect(Horizon system)
+        public PlayerSelectApplet(Horizon system)
         {
             _system = system;
         }
diff --git a/Ryujinx.HLE/HOS/Applets/AppletFifo.cs b/Ryujinx.HLE/HOS/Services/Am/AppletFifo.cs
similarity index 97%
rename from Ryujinx.HLE/HOS/Applets/AppletFifo.cs
rename to Ryujinx.HLE/HOS/Services/Am/AppletFifo.cs
index 1005a2b8ad..215ebfadfc 100644
--- a/Ryujinx.HLE/HOS/Applets/AppletFifo.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/AppletFifo.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.HOS.Applets
+namespace Ryujinx.HLE.HOS.Services.Am
 {
     internal class AppletFifo<T> : IEnumerable<T>
     {