summaryrefslogtreecommitdiff
path: root/src/drumgizmo.cc
diff options
context:
space:
mode:
authorChristian Glöckner <cgloeckner@freenet.de>2016-03-22 00:22:14 +0100
committerChristian Glöckner <cgloeckner@freenet.de>2016-03-22 00:22:14 +0100
commitbc26b2ffd80890003948c2f1c7f50acb5a9dfc87 (patch)
tree78cbc082d8144f4270a400b33028e6e3bef35b61 /src/drumgizmo.cc
parent4871ba69d6b0e2338f07b9bc8077f8899d7d8842 (diff)
Modernized InputEngine::run()
Diffstat (limited to 'src/drumgizmo.cc')
-rw-r--r--src/drumgizmo.cc24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 6bcb7bb..1c437d6 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -53,9 +53,12 @@ DrumGizmo::DrumGizmo(AudioOutputEngine *o, AudioInputEngine *i)
, ie(i)
, framesize(0)
, freewheel(false)
+ , events{}
{
is_stopping = false;
audioCache.init(10000); // start thread
+
+ events.reserve(1000);
}
DrumGizmo::~DrumGizmo()
@@ -268,15 +271,14 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
//DEBUG(engine, "Number of active events: %d\n", activeevents[0].size());
- size_t nev;
- event_t *evs = ie->run(pos, nsamples, &nev);
+ ie->run(pos, nsamples, events);
- for(size_t e = 0; e < nev; ++e)
+ for(const auto& event: events)
{
- if(evs[e].type == TYPE_ONSET)
+ if(event.type == TYPE_ONSET)
{
Instrument *i = nullptr;
- int d = evs[e].instrument;
+ int d = event.instrument;
/*
Instruments::iterator it = kit.instruments.begin();
while(d-- && it != kit.instruments.end())
@@ -298,7 +300,7 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
if(i == nullptr || !i->isValid())
{
- ERR(drumgizmo, "Missing Instrument %d.\n", evs[e].instrument);
+ ERR(drumgizmo, "Missing Instrument %d.\n", event.instrument);
continue;
}
@@ -330,7 +332,7 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
}
}
- Sample *s = i->sample(evs[e].velocity, evs[e].offset + pos);
+ Sample *s = i->sample(event.velocity, event.offset + pos);
if(s == nullptr)
{
@@ -355,16 +357,16 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
}
else
{
- //DEBUG(drumgizmo, "Adding event %d.\n", evs[e].offset);
+ //DEBUG(drumgizmo, "Adding event %d.\n", event.offset);
Event *evt = new EventSample(ch.num, 1.0, af, i->group(), i);
- evt->offset = (evs[e].offset + pos) * resampler[0].ratio();
+ evt->offset = (event.offset + pos) * resampler[0].ratio();
activeevents[ch.num].push_back(evt);
}
++j;
}
}
- if(evs[e].type == TYPE_STOP)
+ if(event.type == TYPE_STOP)
{
is_stopping = true;
}
@@ -390,7 +392,7 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
}
- free(evs);
+ events.clear();
//
// Write audio