UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Make Ion::Events::Journal optional

Browse Source
This commit is contained in:
Romain Goyet
2020-09-17 15:59:07 -04:00
committed by Léa Saviot
parent 6d18c33068
commit 2bee7eb267
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ion/include/ion/events.h
View File

@@ -53,6 +53,7 @@ enum class ShiftAlphaStatus {
// Timeout is decremented // Timeout is decremented
Event getEvent(int * timeout); Event getEvent(int * timeout);
#if ION_EVENTS_JOURNAL
class Journal { class Journal {
public: public:
virtual void pushEvent(Event e) = 0; virtual void pushEvent(Event e) = 0;
@@ -62,6 +63,7 @@ public:
void replayFrom(Journal * l); void replayFrom(Journal * l);
void logTo(Journal * l); void logTo(Journal * l);
#endif
ShiftAlphaStatus shiftAlphaStatus(); ShiftAlphaStatus shiftAlphaStatus();
void setShiftAlphaStatus(ShiftAlphaStatus s); void setShiftAlphaStatus(ShiftAlphaStatus s);

10
ion/src/shared/events_keyboard.cpp
View File

@@ -118,6 +118,8 @@ static inline Event innerGetEvent(int * timeout) {
} }
} }
#if ION_EVENTS_JOURNAL
static Journal * sSourceJournal = nullptr; static Journal * sSourceJournal = nullptr;
static Journal * sDestinationJournal = nullptr; static Journal * sDestinationJournal = nullptr;
void replayFrom(Journal * l) { sSourceJournal = l; } void replayFrom(Journal * l) { sSourceJournal = l; }
@@ -138,6 +140,14 @@ Event getEvent(int * timeout) {
return e; return e;
} }
#else
Event getEvent(int * timeout) {
return innerGetEvent(timeout);
}
#endif
} }
} }

2
ion/src/simulator/Makefile
View File

@@ -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/$(TARGET)/Makefile
include ion/src/simulator/external/Makefile include ion/src/simulator/external/Makefile
SFLAGS += -DION_EVENTS_JOURNAL
ifeq ($(ION_SIMULATOR_FILES),1) ifeq ($(ION_SIMULATOR_FILES),1)
ion_src += $(addprefix ion/src/simulator/shared/, \ ion_src += $(addprefix ion/src/simulator/shared/, \
actions.cpp \ actions.cpp \