diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-05-01 21:36:04 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-05-08 12:16:21 +0200 |
| commit | 42953944da1261584d56405128c6eb3c0e9e7da0 (patch) | |
| tree | 1f150ce606457a0bea5647374e0719ecd9646f01 /src/drumgizmo.h | |
| parent | f8feb953c6d86bee12747679e5e4dac7795a65d0 (diff) | |
The last loader thread stuff.
Diffstat (limited to 'src/drumgizmo.h')
| -rw-r--r-- | src/drumgizmo.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/drumgizmo.h b/src/drumgizmo.h index 3e734b5..eb89050 100644 --- a/src/drumgizmo.h +++ b/src/drumgizmo.h @@ -28,13 +28,13 @@ #include <string> #include <list> +#include <array> #include "audiooutputengine.h" #include "audioinputengine.h" #include "events.h" #include "audiofile.h" #include "drumkit.h" -#include "memchecker.h" #include "drumkitloader.h" #include "audiocache.h" #include "mutex.h" @@ -52,8 +52,6 @@ public: AudioOutputEngine *outputengine, AudioInputEngine *inputengine); virtual ~DrumGizmo(); - bool loadkit(std::string kitfile); - bool init(); void run(int endpos); @@ -73,9 +71,9 @@ public: void setFreeWheel(bool freewheel); private: - static const int MAX_NUM_CHANNELS = 64; - static const int RESAMPLER_OUTPUT_BUFFER = 4096; - static const int RESAMPLER_INPUT_BUFFER = 64; + static constexpr int MAX_NUM_CHANNELS = 64; + static constexpr int RESAMPLER_OUTPUT_BUFFER = 4096; + static constexpr int RESAMPLER_INPUT_BUFFER = 64; protected: DrumKitLoader loader; @@ -87,7 +85,7 @@ protected: std::list< Event* > activeevents[MAX_NUM_CHANNELS]; - CHResampler resampler[MAX_NUM_CHANNELS]; + std::array<CHResampler, MAX_NUM_CHANNELS> resampler; sample_t resampler_output_buffer[MAX_NUM_CHANNELS][RESAMPLER_OUTPUT_BUFFER]; sample_t resampler_input_buffer[MAX_NUM_CHANNELS][RESAMPLER_INPUT_BUFFER]; @@ -95,7 +93,6 @@ protected: AudioCache audioCache; DrumKit kit; - MemChecker memchecker; InputProcessor input_processor; size_t framesize; |