Make Mapper internally use eventsource/sink instead of input/output devices

Author: fredemmott

lib/OutputDevice.cpp renamed to lib/EventSink.cpp

@@ -5,11 +5,11 @@
  * This source code is licensed under the ISC license found in the LICENSE file
  * in the root directory of this source tree.
  */
-#include "OutputDevice.h"
+#include "EventSink.h"
 
 namespace fredemmott::inputmapping {
 
-OutputDevice::~OutputDevice() {
+EventSink::~EventSink() {
 }
 
 }// namespace fredemmott::inputmapping

lib/EventSink.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2020-present, Fred Emmott <fred@fredemmott.com>
+ * All rights reserved.
+ *
+ * This source code is licensed under the ISC license found in the LICENSE file
+ * in the root directory of this source tree.
+ */
+#pragma once
+
+namespace fredemmott::inputmapping {
+
+class EventSink {
+ public:
+  virtual ~EventSink();
+  virtual void flush() = 0;
+};
+
+}// namespace fredemmott::inputmapping

lib/Mapper.cpp

@@ -61,8 +61,11 @@ struct ActiveInstanceGuard {
 void Mapper::setDevices(
   const std::vector<MappableInput> &inputs,
   const std::vector<std::shared_ptr<OutputDevice>> &outputs) {
-  mInputs = inputs;
-  mOutputs = outputs;
+  for (const auto &input: inputs) {
+    mEventSources.push_back(input.getEventSource());
+  }
+  mEventSinks
+    = std::vector<std::shared_ptr<EventSink>>(outputs.begin(), outputs.end());
 }
 
 void Mapper::passthrough(MappableInput &s, const MappableVJoyOutput &t) {
@@ -82,15 +85,15 @@ void Mapper::passthrough(MappableInput &s, const MappableVJoyOutput &t) {
 }
 
 void Mapper::run() {
-  if (mInputs.empty()) {
+  if (mEventSources.empty()) {
     printf(
       "---\n"
       "!!! WARNING !!!\n"
       "No inputs were set. No mapping will be updated unless devices are\n"
       "manually polled.\n"
       "---\n");
   }
-  if (mOutputs.empty()) {
+  if (mEventSinks.empty()) {
     printf(
       "---\n"
       "!!! WARNING !!!\n"
@@ -105,11 +108,11 @@ void Mapper::run() {
   SetConsoleCtrlHandler(&exit_event_handler, true);
   std::vector<HANDLE> fixed_events {gExitEvent};
 
-  std::map<HANDLE, MappableInput> devices;
-  for (const auto &input: mInputs) {
-    auto event = input.getEventSource()->getHandle();
-    fixed_events.push_back(event);
-    devices.insert({event, input});
+  std::map<HANDLE, std::shared_ptr<EventSource>> handle_to_source;
+  for (const auto &source: mEventSources) {
+    auto handle = source->getHandle();
+    fixed_events.push_back(handle);
+    handle_to_source.insert({handle, source});
   }
   printf("---\nProfile running, hit Ctrl-C to exit and clean up HidHide.\n");
   while (true) {
@@ -138,16 +141,16 @@ void Mapper::run() {
       continue;
     }
 
-    auto device = devices.at(event);
-    device.getEventSource()->poll();
+    auto source = handle_to_source.at(event);
+    source->poll();
     gActiveInstance = nullptr;
 
     flush();
   }
 }
 
 void Mapper::flush() {
-  for (const auto &output: mOutputs) {
+  for (const auto &output: mEventSinks) {
     output->flush();
   }
 }

lib/Mapper.h

@@ -18,6 +18,8 @@ class InputDevice;
 }
 
 namespace fredemmott::inputmapping {
+class EventSink;
+class EventSource;
 class MappableInput;
 class MappableOutput;
 class MappableVJoyOutput;
@@ -39,8 +41,8 @@ class Mapper {
     const std::function<void()>& handler);
 
  private:
-  std::vector<MappableInput> mInputs;
-  std::vector<std::shared_ptr<OutputDevice>> mOutputs;
+  std::vector<std::shared_ptr<EventSource>> mEventSources;
+  std::vector<std::shared_ptr<EventSink>> mEventSinks;
   std::map<void*, std::function<void()>> mInjected;
 
   void flush();

lib/OutputDevice.h

@@ -7,12 +7,11 @@
  */
 #pragma once
 
+#include "EventSink.h"
+
 namespace fredemmott::inputmapping {
 
-class OutputDevice {
- public:
-  virtual ~OutputDevice();
-  virtual void flush() = 0;
+class OutputDevice : public EventSink {
 };
 
 }// namespace fredemmott::inputmapping