From f8be5a6d8d0be47596e1d9e6050e6e134f1e4167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Thu, 21 Apr 2016 21:05:43 +0200 Subject: A little refactoring for drumgizmo.cc. Range based loops, static const member variables instead of #define, c++11 convert from and to strings. --- src/drumgizmo.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/drumgizmo.h') 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 audiofiles; -- cgit v1.2.3