From fb992677cf62b6aa982476538faae43e5bbbd87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sun, 12 Jan 2020 15:41:39 +0100 Subject: Introduce EventsDS to handle all the events and enable new features. Also: * Added an id.h class to make IDs with type * Added a range class to easily use range based for loops --- src/drumgizmo.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/drumgizmo.h') diff --git a/src/drumgizmo.h b/src/drumgizmo.h index 8a423d1..0aeab07 100644 --- a/src/drumgizmo.h +++ b/src/drumgizmo.h @@ -36,6 +36,7 @@ #include "audiooutputengine.h" #include "audioinputengine.h" #include "events.h" +#include "events_ds.h" #include "audiofile.h" #include "drumkit.h" #include "drumkitloader.h" @@ -59,7 +60,7 @@ public: bool run(size_t pos, sample_t *samples, size_t nsamples); void stop(); - void renderSampleEvent(EventSample& evt, int pos, sample_t *s, std::size_t sz); + void renderSampleEvent(SampleEvent& evt, int pos, sample_t *s, std::size_t sz); void getSamples(int ch, int pos, sample_t *s, size_t sz); //! Get the current engine latency in samples. @@ -83,7 +84,7 @@ protected: AudioOutputEngine& oe; AudioInputEngine& ie; - std::list< Event* > activeevents[NUM_CHANNELS]; + EventsDS events_ds; bool enable_resampling{true}; -- cgit v1.2.3