Merge branch 'master' of http://git.drumgizmo.org/drumgizmo

1 files changed, 23 insertions, 2 deletions

diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc
index be74624..79d000a 100644
--- a/src/drumkitloader.cc
+++ b/src/drumkitloader.cc
@@ -36,15 +36,30 @@ DrumKitLoader::DrumKitLoader(DrumGizmo *dg)
   drumgizmo = dg;
   is_done = false;
   quitit = false;
+  skipit = false;
 }
 
 DrumKitLoader::~DrumKitLoader()
 {
+  if(!quitit) {
+    stop();
+  }
+}
+
+void DrumKitLoader::stop()
+{
   quitit = true;
   semaphore.post();
   wait_stop();
 }
 
+void DrumKitLoader::skip()
+{
+  skipit = true;
+  semaphore.post();
+  skip_semaphore.wait();
+}
+
 bool DrumKitLoader::isDone()
 {
   bool done;
@@ -67,8 +82,6 @@ void DrumKitLoader::loadKit(DrumKit *kit)
   semaphore.post();
 }
 
-
-
 void DrumKitLoader::thread_main()
 {
   while(1) {
@@ -79,6 +92,12 @@ void DrumKitLoader::thread_main()
 
     if(quitit) return;
 
+    if(skipit) {
+      skip_semaphore.post();
+      skipit = false;
+      continue;
+    }
+
     unsigned int count = 0;
 
     if(kit && !kit->isValid()) goto finish;
@@ -125,6 +144,8 @@ void DrumKitLoader::thread_main()
           drumgizmo->sendGUIMessage(ls);
           
           a++;
+
+          if(skipit) goto finish;
         }
         
         i++;