From 2bee7eb2678bfa0b236a086695dcac0f23524ce8 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Thu, 17 Sep 2020 15:59:07 -0400
Subject: [PATCH] [ion] Make Ion::Events::Journal optional

---
 ion/include/ion/events.h           |  2 ++
 ion/src/shared/events_keyboard.cpp | 10 ++++++++++
 ion/src/simulator/Makefile         |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/ion/include/ion/events.h b/ion/include/ion/events.h
index c5a5fae5b..0d3c8b93b 100644
--- a/ion/include/ion/events.h
+++ b/ion/include/ion/events.h
@@ -53,6 +53,7 @@ enum class ShiftAlphaStatus {
 // Timeout is decremented
 Event getEvent(int * timeout);
 
+#if ION_EVENTS_JOURNAL
 class Journal {
 public:
   virtual void pushEvent(Event e) = 0;
@@ -62,6 +63,7 @@ public:
 
 void replayFrom(Journal * l);
 void logTo(Journal * l);
+#endif
 
 ShiftAlphaStatus shiftAlphaStatus();
 void setShiftAlphaStatus(ShiftAlphaStatus s);
diff --git a/ion/src/shared/events_keyboard.cpp b/ion/src/shared/events_keyboard.cpp
index fe0825a4b..a378ea0fb 100644
--- a/ion/src/shared/events_keyboard.cpp
+++ b/ion/src/shared/events_keyboard.cpp
@@ -118,6 +118,8 @@ static inline Event innerGetEvent(int * timeout) {
   }
 }
 
+#if ION_EVENTS_JOURNAL
+
 static Journal * sSourceJournal = nullptr;
 static Journal * sDestinationJournal = nullptr;
 void replayFrom(Journal * l) { sSourceJournal = l; }
@@ -138,6 +140,14 @@ Event getEvent(int * timeout) {
   return e;
 }
 
+#else
+
+Event getEvent(int * timeout) {
+  return innerGetEvent(timeout);
+}
+
+#endif
+
 
 }
 }
diff --git a/ion/src/simulator/Makefile b/ion/src/simulator/Makefile
index 2cf5fbb82..059bc3381 100644
--- a/ion/src/simulator/Makefile
+++ b/ion/src/simulator/Makefile
@@ -40,6 +40,8 @@ ion_simulator_assets_paths = $(add_prefix ion/src/simulator/assets/,$(ion_simula
 include ion/src/simulator/$(TARGET)/Makefile
 include ion/src/simulator/external/Makefile
 
+SFLAGS += -DION_EVENTS_JOURNAL
+
 ifeq ($(ION_SIMULATOR_FILES),1)
 ion_src += $(addprefix ion/src/simulator/shared/, \
   actions.cpp \