services: decouple mapping actions out of device service and into mapping service.

Author: mfisher31

src/pluginprocessor.cpp

@@ -8,7 +8,6 @@
 
 #include "services/sessionservice.hpp"
 #include "services/mappingservice.hpp"
-#include "services/deviceservice.hpp"
 #include "engine/internalformat.hpp"
 
 #include "pluginprocessor.hpp"
@@ -342,7 +341,6 @@ struct PluginProcessor::Latency : public juce::Timer
 #define guictl context->services().find<GuiService>()
 #define sessionctl context->services().find<SessionService>()
 #define mapsctl context->services().find<MappingService>()
-#define devsctl context->services().find<DeviceService>()
 
 //=============================================================================
 PluginProcessor::PluginProcessor (Variant instanceType, int numBuses)
@@ -515,7 +513,7 @@ void PluginProcessor::reloadEngine()
     enginectl->sessionReloaded();
     enginectl->syncModels();
     guictl->stabilizeContent();
-    devsctl->refresh();
+    mapsctl->refresh();
 
     suspendProcessing (wasSuspended);
 }
@@ -763,7 +761,7 @@ void PluginProcessor::initialize()
 
     enginectl->sessionReloaded();
     mapsctl->learn (false);
-    devsctl->refresh();
+    mapsctl->refresh();
 
     shouldProcess.set (wasProc);
 }

src/services/deviceservice.cpp

@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "services/deviceservice.hpp"
-#include "engine/mappingengine.hpp"
-#include <element/session.hpp>
-#include <element/context.hpp>
 
 namespace element {
 
@@ -43,10 +40,4 @@ void DeviceService::deactivate()
     Service::deactivate();
 }
 
-void DeviceService::refresh()
-{
-    if (auto session = context().session())
-        context().mapping().rebuildBindings (session);
-}
-
 } // namespace element

src/services/deviceservice.hpp

@@ -18,9 +18,6 @@ class DeviceService : public Service
     void activate() override;
     void deactivate() override;
 
-    /** Rebuild live MIDI mapping bindings from the current session. */
-    void refresh();
-
     /** Fires (on the message thread) whenever the set of available MIDI input or
         output devices changes, e.g. a controller is plugged in or removed. */
     Signal<void()> sigMidiDevicesChanged;

src/services/sessionservice.cpp

@@ -10,7 +10,6 @@
 #include <element/ui.hpp>
 #include <element/ui/content.hpp>
 
-#include "services/deviceservice.hpp"
 #include "services/mappingservice.hpp"
 #include "services/presetservice.hpp"
 #include "services/sessionservice.hpp"
@@ -301,7 +300,7 @@ void SessionService::loadNewSessionData()
 void SessionService::refreshOtherControllers()
 {
     sibling<EngineService>()->sessionReloaded();
-    sibling<DeviceService>()->refresh();
+    sibling<MappingService>()->refresh();
     sibling<MappingService>()->learn (false);
     sibling<PresetService>()->refresh();
     sigSessionLoaded();

src/ui/mainmenu.cpp

@@ -12,11 +12,8 @@
 #include <element/ui/mainwindow.hpp>
 #include <element/ui/commands.hpp>
 
-#include "log.hpp"
 #include "utils.hpp"
 #include "urls.hpp"
-#include "services/deviceservice.hpp"
-#include "services/mappingservice.hpp"
 #include "services/sessionservice.hpp"
 #include "ui/mainmenu.hpp"
 #include "ui/viewhelpers.hpp"
@@ -191,8 +188,8 @@ void MainMenu::menuItemSelected (int index, int menu)
         if (session)
             session->cleanOrphanMidiMappings();
         auto& app = owner.services();
-        if (auto* devices = app.find<DeviceService>())
-            devices->refresh();
+        if (auto* mapping = app.find<MappingService>())
+            mapping->refresh();
         if (auto* gui = app.find<GuiService>())
             gui->stabilizeContent();
     }