summaryrefslogtreecommitdiff
path: root/src/drumkitloader.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/drumkitloader.cc')
-rw-r--r--src/drumkitloader.cc18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc
index c997dfb..79d000a 100644
--- a/src/drumkitloader.cc
+++ b/src/drumkitloader.cc
@@ -36,6 +36,7 @@ DrumKitLoader::DrumKitLoader(DrumGizmo *dg)
drumgizmo = dg;
is_done = false;
quitit = false;
+ skipit = false;
}
DrumKitLoader::~DrumKitLoader()
@@ -52,6 +53,13 @@ void DrumKitLoader::stop()
wait_stop();
}
+void DrumKitLoader::skip()
+{
+ skipit = true;
+ semaphore.post();
+ skip_semaphore.wait();
+}
+
bool DrumKitLoader::isDone()
{
bool done;
@@ -74,8 +82,6 @@ void DrumKitLoader::loadKit(DrumKit *kit)
semaphore.post();
}
-
-
void DrumKitLoader::thread_main()
{
while(1) {
@@ -86,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;
@@ -133,7 +145,7 @@ void DrumKitLoader::thread_main()
a++;
- if(quitit) return;
+ if(skipit) goto finish;
}
i++;