summaryrefslogtreecommitdiff
path: root/src/drumgizmo.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-02-19 18:05:53 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2015-02-19 18:05:53 +0100
commit7bdc1773013b90d8bf7adcf5907f7e096dd7be6f (patch)
tree3db301f8f33833226d8d4d732efbcbecb4717881 /src/drumgizmo.h
parentd38c843e13d411ab822b939a477dc6d6bc7fe5b2 (diff)
parentb16f9d793d6e3e4ab88efff112f2fca30ed87be5 (diff)
Merge branch 'master' into lv2opt
Diffstat (limited to 'src/drumgizmo.h')
-rw-r--r--src/drumgizmo.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/drumgizmo.h b/src/drumgizmo.h
index 138e61c..f8d45f5 100644
--- a/src/drumgizmo.h
+++ b/src/drumgizmo.h
@@ -51,14 +51,13 @@
class DrumGizmo : public MessageReceiver {
public:
- DrumGizmo(AudioOutputEngine *outputengine,
- AudioInputEngine *inputengine);
+ DrumGizmo(AudioOutputEngine *outputengine, AudioInputEngine *inputengine);
virtual ~DrumGizmo();
bool loadkit(std::string kitfile);
- bool init(bool preload = true);
-
+ bool init();
+
/**
* @param endpos number of samples to process, -1 := never stop.
*/
@@ -68,8 +67,6 @@ public:
void getSamples(int ch, int pos, sample_t *s, size_t sz);
- bool isRunning() { return is_running; }
-
std::string configString();
bool setConfigString(std::string cfg);
@@ -77,12 +74,12 @@ public:
int samplerate();
void setSamplerate(int samplerate);
-
+
private:
DrumKitLoader loader;
Mutex mutex;
- bool is_running;
+ bool is_stopping; ///< Is set to true when a TYPE_STOP event has been seen.
AudioOutputEngine *oe;
AudioInputEngine *ie;