From cb220c27929600ff7a1980bbe421290e39b2eddc Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 26 Jan 2013 08:42:18 +0100 Subject: Background loader for audio files. --- src/drumgizmo.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/drumgizmo.h') diff --git a/src/drumgizmo.h b/src/drumgizmo.h index a3ad3ca..e79dad0 100644 --- a/src/drumgizmo.h +++ b/src/drumgizmo.h @@ -37,6 +37,10 @@ #include "audiofile.h" #include "drumkit.h" +#include "drumkitloader.h" + +#include "mutex.h" + #define MAX_NUM_CHANNELS 512 class DrumGizmo { @@ -45,7 +49,7 @@ public: AudioInputEngine *inputengine); ~DrumGizmo(); - bool loadkit(const std::string &kitfile); + bool loadkit(std::string kitfile); std::string drumkitfile(); bool init(bool preload = true); @@ -59,11 +63,15 @@ public: bool isRunning() { return is_running; } std::string configString(); - void setConfigString(std::string cfg); + bool setConfigString(std::string cfg); std::string midimapfile; + std::string kitfile; private: + DrumKitLoader loader; + + Mutex mutex; bool is_running; AudioOutputEngine *oe; @@ -77,8 +85,6 @@ private: public: #endif DrumKit kit; - - std::string kitfile; }; -- cgit v1.2.3