1 files changed, 30 insertions, 7 deletions

diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index ca91c12..abe57be 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -119,6 +119,12 @@ void DrumGizmo::setRandomSeed(unsigned int seed)
 
 bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
 {
+	if(settings_getter.drumkit_file.hasChanged())
+	{
+		// New kit loaded/loading - old events no longer makes sense.
+		events_ds.clear();
+	}
+
 	if(settings_getter.enable_resampling.hasChanged())
 	{
 		enable_resampling = settings_getter.enable_resampling.getValue();
@@ -191,6 +197,11 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
 
 		for(size_t c = 0; c < kit.channels.size(); ++c)
 		{
+			if(c >= NUM_CHANNELS) // kit may have more channels than the engine
+			{
+				break;
+			}
+
 			sample_t *buf = samples;
 			bool internal = false;
 			if(oe.getBuffer(c))
@@ -218,6 +229,11 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
 		size_t kitpos = pos * ratio;
 		for(size_t c = 0; c < kit.channels.size(); ++c)
 		{
+			if(c >= NUM_CHANNELS) // kit may have more channels than the engine
+			{
+				break;
+			}
+
 			sample_t *buf = samples;
 			bool internal = false;
 			if(oe.getBuffer(c))
@@ -333,6 +349,8 @@ repeat:
 
 void DrumGizmo::getSamples(int ch, int pos, sample_t* s, size_t sz)
 {
+	assert(ch < NUM_CHANNELS);
+
 	// Store local values of settings to ensure they don't change intra-iteration
 	const auto enable_bleed_control = settings.enable_bleed_control.load();
 	const auto master_bleed = settings.master_bleed.load();
@@ -346,8 +364,9 @@ void DrumGizmo::getSamples(int ch, int pos, sample_t* s, size_t sz)
 
 		if(!af.isLoaded() || !af.isValid() || (s == nullptr))
 		{
-			removeevent = true;
-			break;
+			// This event cannot be played - schedule for deletion and continue.
+			to_remove.push_back(sample_event.id);
+			continue;
 		}
 
 		if(sample_event.offset > (pos + sz))
@@ -431,7 +450,7 @@ float DrumGizmo::samplerate()
 
 void DrumGizmo::setSamplerate(float samplerate, float resampling_quality)
 {
-	DEBUG(dgeditor, "%s samplerate: %f\n", __PRETTY_FUNCTION__, samplerate);
+	DEBUG(engine, "%s samplerate: %f\n", __PRETTY_FUNCTION__, samplerate);
 	settings.samplerate.store(samplerate);
 
 	// Notify input engine of the samplerate change.
@@ -463,10 +482,14 @@ void DrumGizmo::setSamplerate(float samplerate, float resampling_quality)
 		zita[c].set_inp_data(nullptr);
 		zita[c].set_inp_count(null_size);
 
-		constexpr auto sz = 4096 * 16;
-		sample_t s[sz];
-		zita[c].set_out_data(s);
-		zita[c].set_out_count(sz);
+		std::size_t scratch_buffer_size = (null_size / ratio);
+
+		if(scratch_buffer.size() < scratch_buffer_size)
+		{
+			scratch_buffer.resize(scratch_buffer_size);
+		}
+		zita[c].set_out_data(scratch_buffer.data());
+		zita[c].set_out_count(scratch_buffer_size);
 
 		zita[c].process();
 	}