From 2ff860a7f2c8fe5cf027d1d792f539ab8bb27fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Nusser?= <andre.nusser@googlemail.com>
Date: Sun, 24 Apr 2016 13:01:04 +0200
Subject: Make activeevents a member of InputProcessor.
---
src/drumgizmo.cc | 4 ++--
src/inputprocessor.cc | 5 +++--
src/inputprocessor.h | 5 +++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 63eda7b..66d071d 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -52,7 +52,7 @@ DrumGizmo::DrumGizmo(Settings& settings,
, oe(o)
, ie(i)
, kit()
- , input_processor(kit)
+ , input_processor(kit, activeevents)
, framesize(0)
, freewheel(false)
, events{}
@@ -230,7 +230,7 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
ie->run(pos, nsamples, events);
double resample_ratio = resampler[0].getRatio();
- bool active_events_left = input_processor.process(events, activeevents, pos, resample_ratio);
+ bool active_events_left = input_processor.process(events, pos, resample_ratio);
if(!active_events_left)
{
diff --git a/src/inputprocessor.cc b/src/inputprocessor.cc
index 789334b..a232e35 100644
--- a/src/inputprocessor.cc
+++ b/src/inputprocessor.cc
@@ -32,14 +32,15 @@
#include "instrument.h"
-InputProcessor::InputProcessor(DrumKit& kit)
+InputProcessor::InputProcessor(DrumKit& kit, std::list<Event*>* activeevents)
: kit(kit)
+ , activeevents(activeevents)
, is_stopping(false)
{
}
-bool InputProcessor::process(const std::vector<event_t>& events, std::list<Event*>* activeevents, size_t pos, double resample_ratio)
+bool InputProcessor::process(const std::vector<event_t>& events, size_t pos, double resample_ratio)
{
for(const auto& event: events)
{
diff --git a/src/inputprocessor.h b/src/inputprocessor.h
index 24685be..fb12555 100644
--- a/src/inputprocessor.h
+++ b/src/inputprocessor.h
@@ -36,9 +36,10 @@
class InputProcessor
{
public:
- InputProcessor(DrumKit& kit);
- bool process(const std::vector<event_t>& events, std::list<Event*>* activeevents, size_t pos, double resample_ratio);
+ InputProcessor(DrumKit& kit, std::list<Event*>* activeevents);
+ bool process(const std::vector<event_t>& events, size_t pos, double resample_ratio);
private:
DrumKit& kit;
+ std::list<Event*>* activeevents;
bool is_stopping; ///< Is set to true when a TYPE_STOP event has been seen.
};
--
cgit v1.2.3