summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drumkitloader.cc5
-rw-r--r--src/settings.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc
index 6a4c9f4..9167201 100644
--- a/src/drumkitloader.cc
+++ b/src/drumkitloader.cc
@@ -138,7 +138,7 @@ bool DrumKitLoader::loadkit(const std::string& file)
settings.drumkit_samplerate.store(44100);
settings.load_status_text.store("");
- settings.drumkit_load_status.store(LoadStatus::Loading);
+ settings.drumkit_load_status.store(LoadStatus::Parsing);
// Parse drumkit and instrument xml
@@ -226,6 +226,9 @@ bool DrumKitLoader::loadkit(const std::string& file)
settings.midimap_file = drumkit_path + "/" + drumkitdom.metadata.default_midimap_file;
}
+ // Done parsing. Now start loading the audio
+ settings.midimap_load_status.store(LoadStatus::Loading);
+
loadKitAudio(kit);
DEBUG(loadkit, "loadkit: Success\n");
diff --git a/src/settings.h b/src/settings.h
index 7507827..fb93d79 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -38,6 +38,7 @@
enum class LoadStatus : unsigned int
{
Idle,
+ Parsing,
Loading,
Done,
Error