Refactor LightingStateManager

ProcessManager: Watch the runing Processes and call if found a match
ProfileManager: Handle the switching between Profiles (Application)
LightingStateManager: Rendering the Light Events

Adding a change profile animation

Author: xQwexx

Project-Aurora/Plugin-Example/PluginMain.cs

@@ -37,7 +37,7 @@ public void ProcessManager(object manager)
         {
             if (manager is LightingStateManager)
             {
-                ((LightingStateManager)manager).RegisterLayerHandler(new LayerHandlerEntry("ExampleLayer", "Example Layer", typeof(ExampleLayerHandler)));
+                ((ProfileManager)manager).RegisterLayerHandler(new LayerHandlerEntry("ExampleLayer", "Example Layer", typeof(ExampleLayerHandler)));
             }
         }
     }

Project-Aurora/Project-Aurora/App.xaml.cs

@@ -112,7 +112,7 @@ public static void LogLine(this NLog.Logger logger, string text, Logging_Level l
 
         //public static GameEventHandler geh;
         public static PluginManager PluginManager;
-        public static LightingStateManager LightingStateManager;
+        public static ProfileManager LightingStateManager;
         public static NetworkListener net_listener;
         public static Configuration Configuration;
         public static DeviceManager dev_manager;
@@ -353,7 +353,7 @@ protected override void OnStartup(StartupEventArgs e)
                 }
 
                 Global.logger.Info("Loading Applications");
-                (Global.LightingStateManager = new LightingStateManager()).Initialize();
+                (Global.LightingStateManager = new ProfileManager()).Initialize();
 
                 if (Global.Configuration.GetPointerUpdates)
                 {

Project-Aurora/Project-Aurora/ConfigUI.xaml.cs

@@ -44,7 +44,8 @@ partial class ConfigUI : Window, INotifyPropertyChanged
         private bool settingsloaded = false;
         private bool shownHiddenMessage = false;
 
-        private string saved_preview_key = "";
+        private string saved_preview_key = null;
+        public string preview_key => saved_preview_key;
 
         private Timer virtual_keyboard_timer;
         private Stopwatch recording_stopwatch = new Stopwatch();
@@ -64,7 +65,9 @@ public Profiles.Application FocusedApplication
             set
             {
                 SetValue(FocusedApplicationProperty, value);
-                Global.LightingStateManager.PreviewProfileKey = value != null ? value.Config.ID : string.Empty;
+                saved_preview_key = value != null ? value.Config.ID : null;
+
+                Global.LightingStateManager.FocusedApplicationChanged(saved_preview_key);
             }
         }
 
@@ -332,8 +335,6 @@ private void minimizeApp()
                 shownHiddenMessage = true;
             }
 
-            Global.LightingStateManager.PreviewProfileKey = string.Empty;
-
             //Hide Window
             System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Background, (System.Windows.Threading.DispatcherOperationCallback)delegate (object o)
             {
@@ -345,13 +346,12 @@ private void minimizeApp()
 
         private void Window_Activated(object sender, EventArgs e)
         {
-            Global.LightingStateManager.PreviewProfileKey = saved_preview_key;
+            Global.LightingStateManager.FocusedApplicationChanged(saved_preview_key);
         }
 
         private void Window_Deactivated(object sender, EventArgs e)
         {
-            saved_preview_key = Global.LightingStateManager.PreviewProfileKey;
-            Global.LightingStateManager.PreviewProfileKey = string.Empty;
+            Global.LightingStateManager.FocusedApplicationChanged(null);
         }
 
         private Image profile_add;

Project-Aurora/Project-Aurora/Controls/ColorZones.xaml.cs

@@ -168,7 +168,8 @@ private void effect_settings_button_Click(object sender, RoutedEventArgs e)
             if (cz_list.SelectedItem != null)
             {
                 EffectSettingsWindow effect_settings = new EffectSettingsWindow(((ColorZone)cz_list.SelectedItem).effect_config);
-                effect_settings.preview_key = Global.LightingStateManager.PreviewProfileKey;
+                
+                effect_settings.preview_key = ((ConfigUI)System.Windows.Application.Current.MainWindow).preview_key;
                 effect_settings.EffectConfigUpdated += Effect_settings_EffectConfigUpdated;
 
                 effect_settings.ShowDialog();

Project-Aurora/Project-Aurora/Controls/EffectSettingsWindow.xaml.cs

@@ -122,12 +122,12 @@ private void accept_button_Click(object sender, RoutedEventArgs e)
 
         private void Window_Activated(object sender, EventArgs e)
         {
-            Global.LightingStateManager.PreviewProfileKey = preview_key;
+            Global.LightingStateManager.FocusedApplicationChanged(null);
         }
 
         private void Window_Deactivated(object sender, EventArgs e)
         {
-            Global.LightingStateManager.PreviewProfileKey = null;
+            Global.LightingStateManager.FocusedApplicationChanged(preview_key);
         }
 
         private void effect_angle_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)

Project-Aurora/Project-Aurora/Profiles/Application.cs

@@ -44,24 +44,10 @@ public class LightEventConfig : NotifyPropertyChangedEx
 
         public LightEvent Event { get; set; }
 
-        public int? UpdateInterval { get; set; } = null;
-
         public string IconURI { get; set; }
 
         public HashSet<string> ExtraAvailableLayers { get; set; } = new HashSet<string>();
 
-        protected LightEventType? type = LightEventType.Normal;
-        public LightEventType? Type
-        {
-            get { return type; }
-            set
-            {
-                object old = type;
-                object newVal = value;
-                type = value;
-                InvokePropertyChanged(old, newVal);
-            }
-        }
 
         public bool EnableByDefault { get; set; } = true;
         public bool EnableOverlaysByDefault { get; set; } = true;
@@ -84,18 +70,7 @@ public class Application : ObjectSettings<ApplicationSettings>, IInit, ILightEve
         public bool IsEnabled { get { return Settings.IsEnabled; } }
         public bool IsOverlayEnabled { get { return Settings.IsOverlayEnabled; } }
         public event PropertyChangedExEventHandler PropertyChanged;
-        protected LightEventType type;
-        public LightEventType Type
-        {
-            get { return type; }
-            protected set
-            {
-                object old = type;
-                object newVal = value;
-                type = value;
-                InvokePropertyChanged(old, newVal);
-            }
-        }
+
         #endregion
 
         #region Internal Properties

Project-Aurora/Project-Aurora/Profiles/Desktop/Event_Desktop.cs

@@ -25,7 +25,6 @@ public Event_Desktop() : base()
         public override void UpdateLights(EffectFrame frame)
         {
             var layers = new Queue<EffectLayer>(Application.Profile.Layers.Where(l => l.Enabled).Reverse().Select(l => l.Render(_game_state)));
-            var overlayLayers = new Queue<EffectLayer>(Application.Profile.OverlayLayers.Where(l => l.Enabled).Reverse().Select(l => l.Render(_game_state)));
 
             //Scripts before interactive and shortcut assistant layers
             //ProfilesManager.DesktopProfile.UpdateEffectScripts(layers);
@@ -43,6 +42,11 @@ public override void UpdateLights(EffectFrame frame)
             }
 
             frame.AddLayers(layers.ToArray());
+        }
+        public override void UpdateOverlayLights(EffectFrame frame)
+        {
+            var overlayLayers = new Queue<EffectLayer>(Application.Profile.OverlayLayers.Where(l => l.Enabled).Reverse().Select(l => l.Render(_game_state)));
+
             frame.AddOverlayLayers(overlayLayers.ToArray());
         }
 

Project-Aurora/Project-Aurora/Profiles/LightEvent.cs

@@ -8,12 +8,6 @@
 
 namespace Aurora.Profiles
 {
-    public enum LightEventType
-    {
-        Normal,
-        Underlay,
-        Overlay
-    }
 
     public interface ILightEvent : IInit
     {