summaryrefslogtreecommitdiff
path: root/src/drumgizmo.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/drumgizmo.cc')
-rw-r--r--src/drumgizmo.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 32ad66e..8ba45f5 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -56,6 +56,7 @@ DrumGizmo::~DrumGizmo()
i++;
}
*/
+ loader.stop();
}
/*
@@ -144,6 +145,8 @@ bool DrumGizmo::loadkit(std::string file)
DEBUG(drumgizmo, "loadkit(%s)\n", kitfile.c_str());
+ loader.skip();
+
kit.clear();
DrumKitParser parser(kitfile, kit);
@@ -287,7 +290,6 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
continue;
}
-#if 1
if(i->group() != "") {
// Add event to ramp down all existing events with the same groupname.
Channels::iterator j = kit.channels.begin();
@@ -310,7 +312,6 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
j++;
}
}
-#endif
Sample *s = i->sample(evs[e].velocity, evs[e].offset + pos);
@@ -347,7 +348,6 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
//
// Write audio
//
-
for(size_t c = 0; c < kit.channels.size(); c++) {
sample_t *buf = samples;
bool internal = false;
@@ -355,9 +355,11 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
buf = oe->getBuffer(c);
internal = true;
}
- memset(buf, 0, nsamples * sizeof(sample_t));
- getSamples(c, pos, buf, nsamples);
- if(!internal) oe->run(c, samples, nsamples);
+ if(buf) {
+ memset(buf, 0, nsamples * sizeof(sample_t));
+ getSamples(c, pos, buf, nsamples);
+ if(!internal) oe->run(c, samples, nsamples);
+ }
}
ie->post();