From 0571c71aa9fb91adbd246a91a27dd607effad76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Fri, 22 Apr 2016 10:17:22 +0200 Subject: Revert "A little refactoring for drumgizmo.cc." This reverts commit f8be5a6d8d0be47596e1d9e6050e6e134f1e4167. Stupid locale bug re-introduced, thus reverting. --- src/drumgizmo.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/drumgizmo.h') diff --git a/src/drumgizmo.h b/src/drumgizmo.h index 13c657d..7af5dbb 100644 --- a/src/drumgizmo.h +++ b/src/drumgizmo.h @@ -42,7 +42,9 @@ #include "configfile.h" #include "settings.h" +#define MAX_NUM_CHANNELS 64 #define REFSFILE "refs.conf" +#define RESAMPLER_INPUT_BUFFER 64 class DrumGizmo { @@ -71,11 +73,6 @@ 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; - protected: DrumKitLoader loader; @@ -88,7 +85,7 @@ protected: std::list< Event* > activeevents[MAX_NUM_CHANNELS]; CHResampler resampler[MAX_NUM_CHANNELS]; - sample_t resampler_output_buffer[MAX_NUM_CHANNELS][RESAMPLER_OUTPUT_BUFFER]; + sample_t resampler_output_buffer[MAX_NUM_CHANNELS][4096]; sample_t resampler_input_buffer[MAX_NUM_CHANNELS][RESAMPLER_INPUT_BUFFER]; std::map audiofiles; -- cgit v1.2.3