summaryrefslogtreecommitdiff
path: root/src/drumgizmo.h
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2016-04-21 21:05:43 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2016-04-21 21:35:30 +0200
commitf8be5a6d8d0be47596e1d9e6050e6e134f1e4167 (patch)
treead0f01c5c3d2232386cd939e72bbee644ccd7142 /src/drumgizmo.h
parent02b46fa70addd49ce1b7c0a04e56c33963f0e1c2 (diff)
A little refactoring for drumgizmo.cc.
Range based loops, static const member variables instead of #define, c++11 convert from and to strings.
Diffstat (limited to 'src/drumgizmo.h')
-rw-r--r--src/drumgizmo.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/drumgizmo.h b/src/drumgizmo.h
index 7af5dbb..13c657d 100644
--- a/src/drumgizmo.h
+++ b/src/drumgizmo.h
@@ -42,9 +42,7 @@
#include "configfile.h"
#include "settings.h"
-#define MAX_NUM_CHANNELS 64
#define REFSFILE "refs.conf"
-#define RESAMPLER_INPUT_BUFFER 64
class DrumGizmo
{
@@ -73,6 +71,11 @@ 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;
@@ -85,7 +88,7 @@ protected:
std::list< Event* > activeevents[MAX_NUM_CHANNELS];
CHResampler resampler[MAX_NUM_CHANNELS];
- sample_t resampler_output_buffer[MAX_NUM_CHANNELS][4096];
+ sample_t resampler_output_buffer[MAX_NUM_CHANNELS][RESAMPLER_OUTPUT_BUFFER];
sample_t resampler_input_buffer[MAX_NUM_CHANNELS][RESAMPLER_INPUT_BUFFER];
std::map<std::string, AudioFile *> audiofiles;