From 4e216965d026c7db0af5626d07657db3c5421351 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sun, 8 Feb 2015 10:44:33 +0100
Subject: Delay TYPE_STOP event until the last active samples are done playing.

---
 src/drumgizmo.cc | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/drumgizmo.cc')

diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 6b48cda..7fded57 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -47,6 +47,7 @@ DrumGizmo::DrumGizmo(AudioOutputEngine *o, AudioInputEngine *i)
   : MessageReceiver(MSGRCV_ENGINE),
     loader(), oe(o), ie(i)
 {
+  is_stopping = false;
 }
 
 DrumGizmo::~DrumGizmo()
@@ -255,7 +256,23 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
     }
     
     if(evs[e].type == TYPE_STOP) {
-      return false;
+      is_stopping = true;
+    }
+
+    if(is_stopping) {
+      // Count the number of active events.
+      int num_active_events = 0;
+      Channels::iterator j = kit.channels.begin();
+      while(j != kit.channels.end()) {
+        Channel &ch = *j;
+        num_active_events += activeevents[ch.num].size();
+        j++;
+      }
+
+      if(num_active_events == 0) {
+        // No more active events - now we can stop the engine.
+        return false;
+      }
     }
     
   }
-- 
cgit v1.2.3


From aec6b3361b3de8391177261469da6edafd39a080 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 13 Feb 2015 12:56:43 +0100
Subject: Fix locale sensitive float parsing/printing.

---
 src/drumgizmo.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/drumgizmo.cc')

diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 6b48cda..5d7de70 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -43,6 +43,8 @@
 #include "configuration.h"
 #include "configparser.h"
 
+#include "nolocale.h"
+
 DrumGizmo::DrumGizmo(AudioOutputEngine *o, AudioInputEngine *i)
   : MessageReceiver(MSGRCV_ENGINE),
     loader(), oe(o), ie(i)
@@ -451,7 +453,7 @@ void DrumGizmo::setSamplerate(int samplerate)
 std::string float2str(float a)
 {
   char buf[256];
-  sprintf(buf, "%f", a);
+  snprintf_nol(buf, sizeof(buf) - 1, "%f", a);
   return buf;
 }
 
@@ -463,7 +465,7 @@ std::string bool2str(bool a)
 float str2float(std::string a)
 {
   if(a == "") return 0.0;
-  return atof(a.c_str());
+  return atof_nol(a.c_str());
 }
 
 std::string DrumGizmo::configString()
-- 
cgit v1.2.3


From b16f9d793d6e3e4ab88efff112f2fca30ed87be5 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Tue, 17 Feb 2015 19:29:11 +0100
Subject: Remove events from activeevents when ramped down.

---
 src/drumgizmo.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/drumgizmo.cc')

diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index 2f2232c..ddb6358 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -422,12 +422,13 @@ void DrumGizmo::getSamples(int ch, int pos, sample_t *s, size_t sz)
             evt->rampdown--;
           }
           
+          if(evt->rampdown == 0) {
+            removeevent = true; // Down ramp done. Remove event.
+          }
         }
 
         if(evt->t >= af->size) { 
           removeevent = true;
-//        LAZYLOAD:
-//          loader.reset(af);
         }
 
         }
-- 
cgit v1.2.3